OK how about this for an idea, instead of swimming we get some kind of mastery that allows us to move around under the sea like we would on land not sure how it would work but totally possible, that way you have the beauty of the underwater zones without the headache of water mechanics. The great thing about having a fantasy game is there always ways round a problem . ;)