How soon are you shifting into gear?
I used to have a problem with my old 2.0 also. If I didn't wait for a few seconds before shifting into gear my car would idle rough, almost stall. I had to learn to wait and then everything was fine.
I don't know if this helps. Just thought I would throw it in there.
