Well you only count as drowning/suffocating after your bubbles all go away. If you were underwater and still had some bubbles left you could switch to the soldier.
