408 rebuild

Hello all,

I have another thread going about my 408 getting extremely hot and I'm working on that issue, but in the meantime I'm considering doing a major upgrade to the motor to hit 500+ hp and am hoping to get some advice from builders. The motor is a 408, currently hits 408 hp at 4500 rpm on the dyno. It has ported iron heads, a Comp Cams shaft (287/305 duration, .497/.483 lift, 107 LOA), Eagle forged rotating assembly (Eagle 20502), Edelbrock RPM intake, and Holley 750 carb. I'm looking to switch the heads to Trick Flow Power Port 190 heads and the intake to an Edelbrock RPM Performer Air-Gap dual plane. Based on these changes alone, two of the horsepower calculators have put this build at just over 550 hp. My questions:

1. Any reason to change the cam from the current?
2. Any reason to change the rotating assembly from the current? I was considering going with a Scat assembly, but based on the results I'm reconsidering.

Other items you may ask:

Curry 9" rear
904 3-speed tranny
Melling hi-vol oil pump
MSD 6AL and Blaster 2 coil

I appreciate any feedback!