Does he go through puddles out hacking?
We had exactly the same problem with one of ours, he would not go anywhere near water (except the local stream which he's always gone through

) and got quite stupid about it, threatening to rear, even when being led by someone on foot! He wouldn't even go anywhere near the edge.
However, within a couple of months he is now trotting and even cantering through and jumping in and out. OH had a xc lesson where the instructor told him not to let him turn away, and if he went backwards to turn him round and reverse him towards the water. If he stood still or took a step forwards he got praised, but if tried to spin or reverse, he was brought back and 'irritated' into moving (he said not to sit there going 'kick,kick,kick' or using the whip, but to keep niggling at him with legs, hands and whip until he went forwards).
He soon decided to go forwards, and he's a very stubborn horse, so you know when he takes the first step that he's given in and walks right into the water!
I think the fact that yours will go to the edge is a good sign, just needs lots of firmness and patience, preferably with someone on foot to back you up. Just let him stand there and see if he will go in in his own time, and keep going and practising as often as possible. Also make him go through every puddle you possibly can until he learns they're not bottomless, horse-eating things!
I can understand your frustration, we never thought we'd sort ours out so quickly (and we used to have the same kind of problem with loading - record was over 3 hours with lots of rearing) but try to keep calm amd be patient (my OH, bless him, tends to get really cross and they end up in a 'who can be most stubborn' stand-off until horse eventually gives in).
Lots of practice and good luck!