Thats kind of the idea i had in mind next.... either that or taking him to the lake and throwing him out of the boat and letting him swim for a little bit....
I dont think i would try the lake thing.. Start small, if he figures out he only has to a go few feet to hit dry land he may learn if hes gotta swim a while it may make your problem worse.