I am also incline to suggest LR and CS3 (or 4) used in combo. For post process, CS3 (or 4) is very powerful. You don't appreciate LR until you have 50,000+ photos. LR is great for some quick edit and cataloging.
Check them out by using the 30-day free trial.
If budget is a concern, Element 7 is quite useful now.