Thanks man, I've been trying to replicate that bug all day and your pic helped me crack whats going on.
On the clunkiness, I'm tempted to reduce the water resistance or increase melee range from all the feedback I've gotten, but I'll try different approaches before making the choice. As a diver, I was trying to replicate the complications of keeping the right level but I understand that idea might not be fun.