I would use something like this:

If the player is near the top of the water, and is pushing against a wall, the player will perform a hop up pushing him up and out of the water. No traces involved.

A8 com / A7 free