Hi Guys
I had a similar experience with mine. One day I was at a red light and the idle was so rough it nearly stalled unless I gave it some revs. I parked up and found that the dipstick had popped out slightly. Once I secured it back in place the idle was spot on again. No problems since.
Just a thought it might be something as simple as that with yours.
Toby