Well, I just ordered my new i7 system from newegg on Friday.
This is in Canadian funds. Using the Newegg.com site is generally cheaper (even including the exchange rate) and the shipping within the states will be much cheaper.
You can subtract the mouse (mine died, so I tohught I may as well go for a g5), the PSU (no way in hell I'm running a i7 on my 300 watt, but I don't plan on extreme overclocking a xfire setup, so 600watt should do fine) and the case (since my current is too small).
You could get a different motherboard, but I have a personal affixiation to the Foxconn Bloodrage. Many seem to believe it's one of the best, even though it has a very modest price. I recommend the Foxconn Bloodrage (if not for the performance, do it because it's sexy).
I ordered a 4870 1GB because a 4890 1GB is 30%+ or more expensive, even though only a 10% (at stock, though the 4890's can OC higher) performance gain is generally measured.
You could go for high end C2Q, but I wanted to play with the new i7 architecture. Around the same price as a high end C2Q anyways. Thus I went for the i7 920.
I attempted requesting a D0 revision through Newegg customer service, but I was denied. Hopefully, all the C0 have sold out by now...
I somewhat choose the cooler because it looks cool. Though it comes with the LGA 1366 brackets, and apparantly it's decent.
If you want extreme performance, I suggest 2x WD 640GB HDDs instead of a single 1TB HDD.
So, keep your current case and PSU.
Buy a i7 with a FoxxConn bloodrage with a 6GB RAM set of your choice. Then get either 2x640 or a solo 1TB HDD (depending if you feel the need for extra speed with file transfers). Then get whatever CPU cooler you think is awesome. (If you're going to have a open case, get something sexy, if not, get whatever works best).
Hope I helped.