Possible Redesign for Stormrider's Surge

Instead of just trying to make a strict movement mastery that is directly tied to damage, why not make one that's a bit more variable?

My idea is that Stormrider's Surge will grant an effect based on the Summoner spell selected by the player.

Dealing 30% of a champion's maximum Health within 2.5 seconds grants: Ghost/ Cleanse - you 40% Movement Speed and 75% Slow Resistance for 3 seconds (10 second cooldown). Heal - Restores [60 + (7 × level)] health to your champion Ignite - a Grievous Wounds effect, revealing that champion for 5 seconds Barrier - a shield for your champion for [70 + (10 × level)] for 2 seconds Exhaust - a movement speed, armor and magic resist reduction to the target for 1 second Clarity - X% of Maximum mana

Obviously, there isn't really an option for Teleport/Flash or Clairvoyance (unless maybe it spawns a spirit wolf or refreshes your trinket), and I don't think the game could handle another Smite addition without melting.

Thoughts?