are you sure you don't have some water in the fuel, too? I would: drain some fuel from the tank at the lowest point (normally at the fuel filter) into a transparent bottle, let it sit and look for water bubbles ...then, drain the tank completely into containers by pulling the fuel feed line to the filter; pull the filter and take it inside; let the fuel sit in the containers while you and the filter warm up; and replace the filter and then refill the tank by siphoning from the containers which I hoist onto the hood, leaving an inch or so in the bottom of each container ...to be checked, later, for water bubbles in a warm place.
If you find water, which came from your fuel supplier, you can complain, change suppliers, or use the let-it-sit-and-siphon trick (or, pump through a water block filter to fill the tank).
And, to repeat myself, there are excellent (if expensive) after-market filter housings that also do water separation and heat the fuel.
