One more trip to the Dyno after having changed the pilot jets and needle clip position. Couple of adjustments and the fuelling is now spot on, was too lean at low to mid throttle but runs nicely now.
Have also had a play with the suspension, lowered the rear a little and raised the front as I had it a bit too nose heavy, still need to sort the damping etc but am pretty happy with it now, just some minor ongoing fettling to do.
Have to say the lads at SPR are highly recommended for dyno and other work, really know their stuff.