It's strange that they just fight in the water. I had two pairs kept together long ago, and the males attacked each other with beaks and wings on land until I sold one of the pairs. Then everything was just fine.
I think you should get rid of the sub gander if it comes down to that rather...