I decided to learn how to fix it myself, already had a tactrix, grabbed an innovate wbo2, and got logging.
So far I have pulled a touch of timing from the load areas that were seeing knock, re scaled my maf with the CAI to within 5% for closed loop and open loop areas, followed Kiddo's advice on the fuel trim ranges, adjusted some transition timing and set full load fuelling to about 11.2.
IAM is staying at 1 and no pulled timing, only place i still see fbkc is around 2000 rpm at 1ish load cruising in CL - from what i read this is pretty normal for these cars.
My only other worry is i burn a shitload of oil, its using well over a litre in 5000km with a GS AOS, other than that its running great.
Cam