I would be doing what Rhichichi suggested. Take him into the water on a lead with you and use treats as a reinforcement of good behaviour and assurance. Me sounds very protective and just needs to know it is okay. I think in time he will figure it out. Just don't stop taking him so he gets the chance. He sounds lovely