IMO, the combo is down on power already. You said "ported and ;olished" for the heads... Who did them? Were they flow tested? Have you done a leakdown test recently?
heads were done at the motor builder. im sure not a real pro job. done with a hand polisher. no flow test. whats a leak down test? I bet if i put edelbrock heads on the motor would bring it back up to where it should be?