Looking very good, Ian!
Word of caution to anyway tackling a dirty engine and engine bay (bitter experience for me): DON'T hand it over to anyone else to do. I had the crank oil-seal fail on a V6 which left the whole engine-bay covered in filth and oil. Had it "professionally" cleaned, the result of which, a few weeks later, was a failed alternator and ABS module. Two years later I'm still getting electrical problems tracing back to connectors in the engine-bay. Aggressive solvent and pressure cleaning I guess.

David