I suspect the fresh tank of fuel may solve your initial problem

If there had been a build up of condensation in the tank, and the sediment trap in the fuel filter was full (was the sediment light glowing?) then perhaps some moisture had made it's way into the fuel lines, this would evventually make it's way to the last part of the fuel's journey, that being the injectors, they may well have "gummed up" causing some running problems. I'd suggest using Shell's "V" power diesel till you can get round to getting your service done,That fuel has a higher octane level, and contains detergents which should help to dissolve any deposits around the nozzles of the injectors. Or you could try tipping half a bottle of diesel redex injector cleaner into the tank the next time you fill up... Be careful to read the mixing values on the bottle, and that you purchase the DIESEL variety as opposed to the petrol version.
I'd definitely include a new fuel filter in the service, along with a cursory check of the (what is known on here as) Banjo filter, this is the last line of defence against nasties in the fuel, and is situated on the fuel pump.
Do you happen to know if you have one of the "winter pack" bongo's? This is quickly determined by locating a switch with a picture of an engine on it near the driver's knee...If you DO have that switch, please ensure it is switched OFF.
