Your stamina regenerates while swimming if you are waiting near an object like a wall or a boulder. It only stays depleted if you are in open water. You shouldn't be drowning in a crypt corridor. Screen shots would be helpful to identify the problem.