I agree with moving the Focal's to the 2.1 system and getting a set of Klipsch speakers to match your Klipsch center channel speaker. From there everything will depend on your budget and your desires for future expansion. If you can afford the Pioneer SC-1522-K currently at some Costco's ($599) it may be a great option for you. It can operate multiple zones so it could be used for your 2.1 channel stereo room and your 3.1 channel TV room. It also has enough flexibility to work well in the future for a 5.1 HT system while still powering the 2.1 channel system. It will play different sources (for example: internet radio, mp3's, etc into 2.1, Blu Ray to TV) into the different rooms at the same time so you can listen to music in the 2.1 room while your family is watching a movie in the TV room. Still, a receiver like that would be my recommendation for some time in the future. Match those front speakers for the TV room first.
Just getting started. Hope to have some decent equipment within a year or two.