Well mine is running just fine again.... I put a new filter on with ran it for 10 mins, then drained it out, (still lots of water) repeated the process 5! times and now there seems to be diesel only in the filter. For the last change tho I went with 50% ATF 50% diesel. I'll take it for an oil change tomorrow as well. It must have come from the pump cause I checked all the fuel lines and I cannot find any leaks.