Originally posted by Jitatha:

So I am suggesting adjust the depth at where the weapons get put away.

Yeah, I would just make this slightly less sensitive so you only unequip when fully into the swimming animation, not the instant a small wave washes past.