Had the exact same symptoms a few years ago, and it was throttle body related.
Had the throttle body replaced which seemed to fix it, but it came back 6 months or so later.
Eventually ended up having a new wiring loom made for all the connections related to the throttle body which fixed the problem. It's not clear whether this was the problem all along (I think probably) and the throttle body was actually fine.