Yes I hear you on the fuel quality issue, that has to be addressed before replacing any other fuel system components.
After draining the water trap MANY times and replacing both filters several times I don't seem to get any more water or dirt from either.
I'm tempted to remove the tank, drain it and have it steamed but everybody tells me that there is a high probabillity of dammaging the threads in the bottom of the plastic tank?
(according to the guys at the Case IH dealer where I buy parts)
I wish I knew how to identify if it is in fact the lift pump, or injector pump that was the cause of the problem.
Would removing and inspecting the lift pump tell me anything?