Heinz,
The MAF sensor is clean. I couldn't get the throttle sensor connector off, but I soaked it in contact cleaner - (not very scientific)
I couldn't get the throttle pedal connector off either! It's a bit cramped down there.
While I try to locate a fuel pump spare I'll chase down a coil pack, I expect someone knows where to get that in the UK.
I think I'll toast the elimination of the switch as a culprit with a sip of Laphroig tonight, and I hope you do too!