I'm a bit confused about the software names/versions you mentioned, so forgive me if my answer misses the mark.
I use a combination of Adobe lightroom (2.7) and photoshop (CS3). Lightroom is good and I think would do all the things you are looking for. On the downside, it can be slow, I find managing catalogs quite confusing/painful, and you can build up quite a lot of state in the program that it is not obvious how to transfer to another computer when you need to upgrade (going through that pain now).
If you have Photoshop CS, then you presumably already have bridge. I haven't used bridge much since getting lightroom, but I think it can also do keywording and searches, so you might want to explore that too.