A better avr will enhance your system as well as timber matched speaker. You don't need Auddysee, it is a nice option but, Pioneer and Yamaha room correction systems are also excellent. List your budget and some avr choices. I would moved the focals for 2.1 listening and use Klipsch for the 3.1 or future 5.1 or 5.2 setup.
Klipsch RF 7 based HT 7.4, Pioneer SC 35, Acurus 200 Five, Dayton 18 Ultimxa Dual Sub Cab(2), Dayton 18 Ultimax Large Vented Sub Cab (2), on Berhinger I Nuke DPS amps, Aura Bass shakers, Samsung BDP F 7500, Asus/My Book Live HPC 4 TB
Yaquin VK 2100 amp, McIntosh XR 5 speakers, Samsung BDP F 7500