[stephend]

Re your cutting out problem, I've just spotted your comment that it's occurring when the fuel level is low. I recall reading on here that there's an internal hose in the fuel tank that pipes fuel from one bit of the tank to another. The hose can perish, and that leads to running problems when the fuel level is below 1/3 full or something like that. If it is that, your options are either to drop the tank out and renew the hose, or many people just avoid letting the level drop that low!

It's worth a search to try and dig out those threads.