371 build W/Big Mouth heads

Yes I had a benchmark in my mind of 525-530 peak HP and peak TQ of 470-480 to consider this experiment a success.
Planning on trying an advance curve, smaller diameter collector headers, different sparkplugs, carb spacers, and really dialing in the carb. As of right now I have not done a thing other than setting timing @ 36-37 and making sure lash was set @ .018" hot. I haven't even installed air turbine to record air consumption/AFR. My crappy spring compressor tool ate up way too much of my time last night. J.Rob
Do you think the peakiness and torque issues are cam or head related? Or both?