I recently upgraded my system to a all Klipsch as well. Got the following at Best Buy:
F2 main speakers
C1 center channel
S2 surround speakers
Sub12 subwoofer
Using a Onkyo TX-SR503 receiver and Acoustic Research 16 gauge speaker wiring. Sounds so much better than my older system. Though the total was a little higher than I originally planned to spend.