Suggestions on speaker upgrade for HT

[JayFank]

Currently I have a 7.1 setup, and am looking to upgrade after 5 years with my current setup. My budget is in the $3000 range.

My current setup:
Center: Polk CS1 Series II
Fronts: Polk Monitor 60
Surround sides: Polk Monitor 40
Surround backs: Polk Monitor 30
Subwoofer: BIC F12
Receiver: Denon AVR1611

So far, I've looked at the Klipsch RP series, namely the RP-280F for fronts and the RP-450C as center channel and the accompanying RP bookshelves as side and back surrounds, as well as an HSU VTF-3 sub and a Denon X2300 or X3300 receiver.

To further add, the room is 16.5 feet wide by 18.5 feet long with 8-foot ceilings. My TV is situated on one of the 16.5-foot walls, which both have 36-inch door openings. The room is fully enclosed with the exception of one of the 36-inch door openings being a walkway into another room. My setup will be used for Blu-rays and television 90% of the time and video games the other 10%.

Anyone else care to offer up some suggestions?