My only question about your interpretation, I think. Is what happens when you go back underwater?
Example: I'm at -50ft. Water Walk
I rise to the surface (in my head, there's a little "plop" noise, but that's optional)
I decide I want to go back down for a round.
Then do I swim back up and "climb" out of the water onto the water?