Finally pulled the trigger on a new machine.

[kandrathe]

I decided to go with iBuyPower... It was a machine on Christmas special.

CoolerMaster HAF 922 Gaming Case - Black
Cold Cathode Neon Light - Blue
Internal Expansion [6-Port] NZXT Internal USB Expansion System + Bluetooth & Wireless N Modules
Intel® CoreT i7 960 Processor (4x 3.20GHz/8MB L3 Cache)
Liquid CPU Cooling System [SOCKET-1366] - [Free Upgrade] Standard 120mm Fan
12 GB [4 GB X3] DDR3-1600 - Corsair
NVIDIA GeForce GT 520 - 1GB
ASUS Sabertooth X58
450 Watt -- Standard
120 GB ADATA S510 SSD - Single Drive
2 TB HARD DRIVE -- 64M Cache, 7200rpm, 6.0Gb/s - Single Drive
[12X Blu-Ray] LG BLU-RAY Reader, DVD±R/±RW Burner Combo Drive - Black
3D Premium Surround Sound Onboard
Onboard LAN Network 1Gb
Microsoft Windows 7 Home Premium + Office Starter 2010