Well, its nearly Xmas! After a bit of toing and froing with Doncaster (they read something out of my ECU, probably to verify I havent tampered with the tune), they have offered to pay for parts, me to pay for labour. I finally got from them its a new short block. All up cost to me is ~$3400, which includes getting both heads done - check the guides, flush all the galleries, reset the clearances etc. I am going to add a clutch plate and throwout, but a pressure plate only if its necessary, which I doubt, and a new oil cooler - some say they have seen these clog and cause oiling problems. Suby dont have any, but I found a genuine unit at Tuspeed. New short blocks seem to be around the $2500 mark. They are giving a 1 year warranty on the work, 2 year on parts. This will be very close to a brand new engine after this.
Hopefully all done by end of next week!!
Woo hoo!
jp