Been there with the water. Do you happen to park nose down in that garage? If so, gravity settles the water near the fuel line, and you will get hesitation for the first several minutes of operation. Took me a while to figure the gravity factor out.
My water was from contaminated fuel from a particular gas station. Beware.

__________________
1986 300E 5-Speed 240k mi.