Any underwater zone we are likely to see are probably going to be like the Underwater Temple or or such. Actual swimming combat would be very awkward with this style of gameplay. They would have to have completely separate everything to even look good, or play right. There are better things to spend their time doing than conjuring a whole new combat system that takes into consideration underwater positioning.