Thanks for the reply Bigedd9990.
The problem is similar, but it never stalls.
It surges from 1000 rpm to 1800 (ish) and back in about 2 seconds.
It only happens after at least 10 mins driving from cold.
It started at the same time that the "Exhaust emission" warning lamp came on.