I would honestly keep what you have and just add the Klipsch sub {that sub for $299 is a real good deal, the sales dont last long but they come and go frequently}, then save up for a decent AVR {the 616 is at a4l for $299 refurbed, if you really like that one... Then get something for your speakers besides the Klipsch quintets {almost anything lol}, 5 Ascend acoustic 200se's would be a good choice... But I dont think besides the sub that the setup you chose will be any better than what you have...