YES! I know what you mean!!

I can also swim really well and took lessons when I was younger, so I also end up face palming when I read scenarios where the character you're playing end up drowning.

I think the pool scene annoyed me as well, but for a different reason. Washio is all sweet to you in front of people saying that he's with you, BUT then reverts to an arrogant person whom you want to drown in the pool because he used you as a human shield.