Well I had a really good look at my bike this week as I have done several thousand times before and basically I ended up changing every part I previously hadn't. So I swapped over the CDI and hey presto my bike is working extremely well now and as fast as ever before
Essentially where i swapped over the engines, there is a difference between the 2005 timing marks and the 2007. The preignition the 2007 cdi was producing was giving a false lean indication so thats what it appeared to be.
However I had already ordered my 120 jet by then so I will wack it in with a performance air filter to see the results.
Thanks for the help guys. My bike is finally running properly. Next project is to up gear it so anyone who knows where I can get a final reduction kit from........ I'm really just looking for indicated 80MPH on the motorway