Well, that didn't take long; you went down the rabbit hole without a moment of hesitation.
All kidding aside, you cut to the chase and that's the best strategy. Incremental upgrades - frequently referred to as "upgradeitis" - can get costly in a hurry. By going right to a better system you almost certainly saved yourself money in the long term.
You'll likely find the subwoofers to be a weak link in that setup, but the rest of it should do just fine. I assume since everything is Klipsch you went with one of their package deals? They seemingly do that for many configurations.