Eventually got all back together. New condenser , dryer and i must admit a universal fan. Rad and intercooler out to be washed out, with the confusion in my other thread regarding the revised hose connectors from the diesel cooler sorted.
Bit of a fiddle but all done.
Also replaced the bonnet...