About the water thing, I like this idea for that:
When you are, for example, holding a surge, and you switch to torrent, the water just starts flowing around you, like torrent would. Reusing the water, which makes you less predictable. + It would add the defensive into offense part of water...