Try running the car for a few hours w/o AC and see if the water problem stops... I know you said you think its related w/ the water/coolant, but its a easy thing to try, if your out of ideas.