Sooo.... new fuel pump, new fuel filter asembly, new teabag etc. I also got the injectors cleaned which was actually a waste of money as there was no difference from before and after, they were fine before they were cleaned (but of course they still cleaned them and charged me)
Anyway once the bike started up (with the pod filters on) it ran perfectly, I went for a short test run and up to about 5K its running great, even smoother than before.
I will keep you posted , but fingers crossed there wont be any need for a dyno.