A welded or pinned water pump would be good, danville and merchant sell both. Would be a good time for a one piece y-bridge if you were planning on ever doing one. Hsp makes a nice one now. With the heads off it would be a good time to have the valves re done along with any other head re surfacing. I wouldn't shave them any more than .010 off the head gasket surface. Whatever they take off match the intake runner side to it. Also better valve springs possibly?? It will be easier to get to the oil cooler now to change seals before they go bad. Also a good tome to do injectors and turbo and cp3 like you mentions. Sky's the limit but it all boils down to budget. As far as a cp3 one of the sportsman pumps or danvilles modded pump would be fine for up to 700hp i believe. Next step would be a 10mm stroker. Either one will need efi live re tunes.
Sent from my iPhone using Tapatalk