Oh right. Sorry!
Can you afford some dyno time? It's the fastest way to get it right. Make sure you keep records of all the stuff you do, including the temp on the day, and how it felt. Looking back over my track notes made it a helluva lot easier to go in the right direction when the power delivery was poo.
Have you the full HRC setup, with blocked PJ's?
_________________
MC21SP Plaything
BMW F800GS Bumblebee
Triumph 9551 Daytona Big boys toy
FJ1100 Sporting relic
GTS1000 oddball