Might be a dumb question, but have you tried any type of fuel conditioner like CRC Diesel Dry? I had a persistant WIF not to long ago, drained it about 4 times, got sick of doing that (had water each time though, do you?). Decided to try the above and after about half the tank I had no more...