[gumba]

I would take it down to a short block. Replace all the head studs. I sent my cams & rockers to Elgin who did a turbo sport grind. I sent the heads to TK for a valve job, port & polish, matched aluminum injectors and ported the intake manifold. I'd ask about twin plug but not sure you need it. I went with the XDI ignition which was very simple to set up. The XDI 2 is more involved using a lap top to program. While the motor was down, I sent the short block to TK to check the rod bearings. TK stated they could change the bearings without splitting the case.
Ollie's is another good machine shop choice.
I'm sure the turbo guys will pipe in. I think the 7006 boosts to a higher rpm than the 7200.
All the choices are going to be based on how you plan to drive the car, street/track?