I love the macro, but for the AOE, couldn’t you just add a mod key for the spell Starfall? I know this is supposed to be one button, but it would do the job
Due to the rotation trying to add starfall in it results in significant dps loss due to it attempting to fire starsurge after every solar/lunar. only thing you could consider is replacing the mid and end starsurge with starfall however in my tests this was far from ideal. and having it as a alt would not work due to it spending AP faster then you could be able to charge for it.