One other thought, you might check the fuel return lines (fuel cools the injectors, is then returned to the fuel cell). If the unit is 5-6 years old or older these lines will crack. Still sounds like water in the fuel. Login to read more.