How about a macro that automatically toggles movement speed on the fly in order to make movement in water more like movement on land. Ie: this could set speed way up for an instant to get you moving then toggle it back, then add a movr-to-loc type feature for stopping and staying put.
Like when you issue a /stop command it could record the LOC and keep you there in that exact spot.
This might help with water raids and spell casting in water where mobs and players are pushing back n forth.

