Having done similar on Otto the first year we had him, can recommend green gunk or autoglym engine and parts cleaner, effective and much less toxic. Also replacing head bolts with a stud kit, torque to 25lbft, leave overnight, torque to 50lbft, can then go straight to 70, no detectable extra...