Agree with P E H - go for the new head, preferably a -22, and see if they can use your existing valves and springs. Otherwise, everything seems right. Best of luck.

__________________
Chris

'04 ML500 - 53k, Inspiration Edition, Desert Silver
'11 Audi A4 Avant - Brilliant Black
'87 300SDL sold
'99 C280 Sport sold
'85 190E 2.3 sold