Totally New Home Theater

[DBlackGT]

Hey guys this isn't a post on which speakers to get (because I already know) or which receiver I like better (narrowed it down to 3). I just need some opinions on what my fellow blu's would do.

Alright here it is, I got about $4,000 to spend on new audio stuff. I just bought a Panasonic 50PZ85u. So i'm good in video. I think I am going to get the new Klipsch WF-35 towers and the WC-24 center. This setup is about 2,000 right there. Now heres the part I am stuck on. Do I spend the rest on a matching sub and surrounds? or do I spend the rest and upgrade my current Yamaha receiver (The RX-V2500 which has no HDMI inputs or new audio formats) to the new RX-V1800 which does and use my current sub and speakers for surrounds?

I was also thinking about the Onkyo 805 which vanns has on sale for $699.99 right now.

Or the Yamaha RX-V863? or just buy a stand alone player that has internal decoding along with multichannel outputs so i can use my current receiver?

Any opinions would be greatly appreciated. Thanks.