Yes, Change your plugs. I had the same issue. Changed my plugs and it magically went away. Mine was specifically when the AC was on and I was at a full stop, RPMs would surge and the car would "jump". 20K later has never happened again.
I got my plugs from rmeuropean.com