Swimming ~ walk motion with other animation. You need to consider that your character is intersecting the water surface (ground).
Diving ~ fly motion. You might want to add some sort of buoyancy forces dependent on the distance to the water surface. You should at least counter the gravity.
Does this push you into a direction you can work with?