It is an interesting problem to say the least @danny5. I'm hoping that someone that has experience may be able to share what helped them. I did see an article that talks about treatment and management of aquaphobia if you haven't already seen it.

-- Aquaphobia (Fear of Water): Symptoms & Treatment:
https://my.clevelandclinic.org/health/diseases/22958-aquaphobia-fear-of-water#management-and-treatment
Have you thought about seeking help to try and treat you fear of water?