Made some good progress today. Got the new bits, fitted them, filled the coolant system with diesel. Went for a drive, got it up to temp, came back, no leaks. Drained the diesel out of the coolant system, came out nice and dirty, and relatively runny, so must have done some good. Refilled it...