I think that what you are doing is fine.

You want the dirty oil out of the engine. It holds acid residues that will damage engine parts. You will be running your diesel at fraction of redline RPC's, temperatures, etc.