That Marathon station on Route 9 sold me a bad batch last year. The diesel cleaner made it run worse before I had to drop the tank. Sometimes you just get stuck with junk fuel no matter what you try.
Ever try running some diesel cleaner through your system? When my last truck got bad fuel, I added a bottle of the hot shot stuff and swapped the water separator first. That combo cleared it right up for me.