Could the long warmup be due to a thermostat stuck open. My diesel took forever to warm up and turned out not to have a thermostat at all! With the thermostat back in it was much warmer.

Peter