I’d ditch the power commander and get a specific eprom. JHP or CJS. Fuel filter changed and set the fuel injection up. I’m off this coming week, but yes, it’s quite a lead time at the moment.
And new plugs Mine doesn't enjoy 20 or 30mph and can be lumpy, it also pops and bangs like a chav on the over-run... Shame you aren't closer to Cornwall, could have done a side by side test