So here is my suggestion:
If you are in water and press shift while you are on the slot that you have waterspout bound, instead of doing fastswim, you will create an actual wave under you that lifts you 2 - 3 blocks off the ground while still making you go forward fast. This will last for as long as you hold shift. If you go out of water, you will be shot out towards wherever you are looking/the direction you were going. If you click before you go out of the water, the water that makes up the wave will follow you out of the water and turn into the regular water wave (circling you)/torrent. If your release shift while the water is circling you, water wave will happen. If you click you use torrent. The torrent part should be able to be frozen.
Thanks for reading!
