3 years later and I think I've found the problem...
Engine has been racing again at idle - surging up to 3000/4000 rpm - and worryingly when I'm driving along.
Today I disconnected the MAF sensor - result: engine racing gone, idle normal about 1000 rpm, and if there's a drop in performance it's barely noticeable.
Local parts place quoted £71 + Vat for Bosch replacement, Ebay £25 delivered. Wondering if it's even worth replacing as I can't tell any difference with MAF disconnected. Might even be worth attempting to clean? Must be one of the most accessible parts on the car to remove/replace - at the front (and top) of the engine bay and just 2 x 10mm bolts and a hose clamp to undo...
This might also explain the engine warning light coming on intermittently.