I'm glad I'm not the only one who sees the awful "synergy" here. I'd love to try my hand at reworking Solar 3.0 Warlock. In order to do that, we have to look at the Solar Warlock's themes, which are very phoenix-like; aerial play, healing, and burning. Solar 3.0 focused a bit too hard on the aerial play and healing, and Touch of Embers, as good as it is, feels like a cheap, band-aid solution to the "burn" aspect. I feel it's pretty simple to see that there are 3 aspect slots and 3 focus points for warlocks, so we can easily do that. Heat Rises Doesn't need much work. Let it grant grenade energy each time your scorch ticks, sorta like Dawn Chorus with melee energy. Maybe add the healing effect from Icarus Dash to it too? "Bountiful Sunlight" I like this idea, but I feel it could be a bit better. Like, you grant yourself or an ally a Sol Soul buddy whenever you heal or empower them. The sol buddy can grant different effects depending on the source, like, healing or empowering from rift or well can grant the benefits of standing in the rift or well for a few seconds even after leaving, and any burst heal can cause the restoration effect. Touch of Embers Despite this ability being pretty good, I feel it kinda feels like it's own thing without anything to support or be supported by (aside from the healing grenade stuff). I'd suggest a rework to bring it more in line with the burning/exploding aspect that old bottom tree had. Something like, "Your grenades deal more scorch and your scorch stacks linger longer. Defeating a scorched enemy or defeating an enemy with a solar ability causes the target to ignite. Daybreak projectiles deal increased damage the more scorched the target is and enemies standing in your Well of Radiance are scorched." Icarus Dash could probably be coupled with Phoenix Dive, but keep it a separate cooldown just as it is. This would definitely make Phoenix Dive, as is, a more appealing option.