If you're going to replace the internals, do it right. Get a set of eagle rods and JE pistons.

Head work should be the last thing you do, the Z6 head will be fine for 7psi. You wont see much of a gain for the money you're going to spend.