I'd replace the idle control valve first, the most easiest to do and the one most likely to be giving you the issues! Cleaning it isn't always the answer as they are so sensitive.