One other thing: I have checked in both the Haynes manual and the Deffie owner's handbook and nothing is mentioned about using a flushing agent before refilling with fresh oil. Is this a good idea or not? Perhaps it's a no-no for diesel engines, I don't know.
Also, I hate throwing anything out...