I'm chasing the same issue but mine Sometimes surges while in gear as well. So much so that if your at a stoplight and it starts it'll try to push through the brakes. But if I give it a couple hundred rpm rev and hold it steady it stops surging.
I have replaced plugs, wires, cap, rotor, iac, maf, tps and now I'm about to try a brake switch cause it has also developed what feels like a bucking I suspect is either a failing torque converter or the converter randomly locking/unlocking. Supposedly the brake switch controls tc lockup and some have had this issue if that switch fails. Worth a try for the cost on that issue.