Trust me on this one. Same thing happened to me not too long ago. After it did the rough idle thing for a while, it started to cut out completely on me every once in a while. Finally, it stopped all together.

I did my homework and started diagnosing the problem. Turned out to be the fuel pump relay. I was able to resolder three broken solder joints on mine and the problem is now gone.

If the car ever shuts down on you and will not start, look around on the forum for info on it. If you have the manual, it explains how to diagnose it too. I found that by jumpering two pins on the relay socket, I could bypass it. When bypassed, the car started right up.

Good luck