I checked the piston at the bottom of the lift pump, and it was fine. I removed it, gave it a clean, then refitted it.
I also blew back through the tank line, drained the fuel and refilled the tank.
It appears to have fixed it, although I'll need to try it under load first.
I'll post back here...