Core i7 or wait it out for Phenom 2?

So my desktop kicked the bucket the other day, after some troubleshooting, I think it's the CPU.

Which is okay, cuz its time to upgrade anyways!

After reading many reviews on the poor performance of the current Phenom's, I'm reluctantly looking at going Intel (I've always been an AMD guy).

So I'm looking at:
Core i7 920 CPU
Asus P6T-Deluxe Mobo
6GB OCZ PC12800 DDR3 memory
Radeon HD 4870 1GB GPU
Corsair TX750W 750watt Power Supply
(All from tigerdirect.com)

Probably will recycle my current Case/HD/Optical Drives

First off, any recommended changes/improvements? I will admit, it was wayyy over my projected price for an upgrade, but I figure with Intel's new Socket LGA 1366 mobo, it will have some longevity for newer CPU's.

2 Questions:
1. Do you think prices will drop any more before christmas?
2. Should I wait it out and go with the Phenom 2 which from what I understand will come out on Jan 8th? Which look to be more on-par with the Core i7 and probably will be cheaper.

Sorry for my extremely long post. But any help/advice would be greatly appreciated.

Thanks in advance!

Yeah there are new claims to clock speeds on Phenom II, but without benchmarks who knows?

Go for INtel, Intel have been kicking AMDs but since they brought out the core 2 duo. AMD are in financial trouble due their purchase of ATI and their investment in the combined cpu/gpu chip.

So Intel have more moeny behind them and are creating cpus a lot faster than AMD. So I would go for Intel.