Not for a clearly aquatic form. It's just not realistic. Or feasible, with what just happened as an example.

What's the worst that could happen? You could be in the river or lake when you change back, and you'll just climb out and rest on the river's edge. At least the isolation will keep you from wandering ... somewhere.