The same needs to be done for bottom tree Dawnblade. Every perk there is "here's an effect that you only benefit from while your Super is active" plus a charged melee with a near-useless bonus.