I think that the (Aquatic) subtype is good. (Water), on the other hand... well, they live in water, but it's not an integral part of their beings (as it is with marids, for instance). Plus, "water" on the Outer Planes is not elemental in nature but rather "spiritual", a physical manifestation of...