Missed on this combo?

Rework the heads.... Bigger carb.... More timing....
I think your rite... Heads are most of the issue...