I am not a fan of Klipsch speakers, and you are correct about that sub....
I would start from scratch, for $1500 look into the Pioneer series 2's {$450 or so}, with a decent Denon from A4L {$300 or so}, and an HSU sub VTF2 $583....
If you don't like the pioneers you can step up to a really good bookshelf system from Ascend {cbm170 fronts with a decent surround like the fluant bipoles for around $600 for all 5}....
but look around and go take a listen to the pioneers they are very easy to audition {BEST BUY stores}....
Theater- Emotiva UMC1 pro, ERC2, XPA5 amp, Ascend 340se frnts & cntr, 200se srds, HSU VTF2, PS3, LG 55" LED, & Harmony remote
Whole house system UPA200 amp, vol. controls, d-box, 6 zones- Yamaha speakers
Front parlor-2.2 system- XDA1 dac, XPA2 amp, Pure i20 dock, 2 sw300 subs, WD EVO2-40's
Lwr parlor-2.2 system- Wharfedale Jade 5's, 2 sw300 subs, XPA2
GYM- EVO2-8's, carver monoblox, wd sub
bedrm- Jolida 202 tube amp, tekton lores,D1 DAC
PC-Emo MiniX,CBM170's,12" Sub,D1 DAC