I didn't drive it, just revved it in Neutral on my drive and the throttle 'jerkiness' was still present.
I did get some Air Flow errors, yep. I remember seeing an 'air flow HIGH' and 'air flow LOW' error. Cleared them after the test.
I'll check the fuel pump too, not something I've looked at...