I'd try to get something completely unfazed by the water, with a patient friend, to come with you. Take the unfazed horse in to the water and get them to just stand there, and then try and take yours up to it. Then just follow the other horse through, lots and lots of times.. Fire would do water at XC courses (after lots of similar 'following someone else through' practises) and wouldn't go near puddles on the road, so I would n't bother too much about those if I were you.
Ross
Ross