TD5 Engine Overhaul - Change out

Hello everyone, I have since removed the dead td5 engine from my disco after oil pump bolt failure!! God sake!! So I now have a donor td5 ready to go but wanted to know in all your wise experience the best things to replace on the engine whilst it's out I.e water pump / core plugs etc?

I don't really wanna be taking it back out anytime soon as it was a pig getting the dead one out.

From my limited experience
Change the crank shaft seal at the flywheel side, need the sump off but I suppose you will want to check the oil pump bolt anyway before fitting the new engine. long job to get at it when engine is in.
Change the starter motor contacts, quite cheap and much easier to get at when engine is out.