How it is now:
You set up any move that uses Left-click>>Hold-shift as activation: OctopusForm, Torrent, SurgeShield and WaterWave. Once it's set up, you can only use the water for that move. If you want to use an other move before you used the move that is ready to use, you'll need a new water...