I forgot to mention, if it's been overheated, replace BOTH the oil cooler and EGR cooler.

You don't want to have to go back into that thing again once it's together. Login to read more.