FPR fitted, and then mapped at RCM.
Will save the result for now as the dyno day is on Saturday and Powerstation is my choice for figures as I've had many runs there.
My neutral position sensor is faulty though, causing my AVCS to not function right, so I am missing a chunk of power/torque low down which is annoying, but once replaced I will get it checked over again.