I just cant help but notice that Sunlocks were restricted from the start because of the need to make Icarus dash an aspect. The 3rd aspect could have been based around attunement of grace, or a solar soul buddy. A Sol soul if you will. What if Icarus dash was an abilty instead? That way you would still have to give up your rift. Then you could put the dive on the Heat rises aspect instead since that's more of its thing.