Couldn't it also just work if using Unmend/Lightning Shot/Piercing Talon just applies a buff that turns Shadowstride/Trajectory/Winged Glide into Plunge/Rough Divide/Spineshatter Dive to make up for some of the damage lost from using those?