Thanks for the tips, @Vermess. Based on a proposal I got, the shop recommended upgrading to a 11mm oil pump, replacing the oil cooler, as well as the VVT solenoids and both intake camshaft sprockets. I'm not going to go with this shop that quoted me, but I plan on sending my heads to Head Games...