Sorry, I'm missing something here. Why are you getting so much water in your fuel to start with??? Also, why run #1 diesel? It has less of the lubricating qualities that your fuel system needs! #1 is primarily designed for jet engines, not diesel engines.
I ran literally a million miles driving...