So just an update on my engine rebuild. Speedhub in Pukekohe supplied me with a new W20C shortblock. They also supplied a new oil cooler and cleaned my AVCS cam gears. The heads were sent to a local engine reconditioner who sourced a new camshaft, fitted new stem seals and reset the valve clearances. Engine was reassembled locally by my mechanic. I sourced new oil pump, head gaskets, O rings, seals etc as well. A new clutch was also fitted.
Car has been running on a break in tune for the past couple weeks. Tuner also disabled all the TGV codes and secondary air pump codes as I deleted these while the engine was out. I fitted a Crawford Air Oil Separator V2 while buying bits for the rebuild and purchased a baffled sump from James Marshall Motorsport.
So far so good. It's definitely getting a dyno tune this time once it's run in!