Yep, make sure all the components in the ignition system are working properly. And did you mention that you cleaned or changed the IAC (Idle Air Control)?

When chasing gremlins like this, I like to go to a pick-a-part yard and find a vehicle like the one you are working on that has new parts and pull everything that is even remotely likely to cause an issue. Usually $25 to $50 will get you a couple hundred dollars worth of parts.