Case: Antec DF-85 - $129.99
PSU - Antec CP-1000 - $149.99
CPU - Intel Core i7-2600k - $324.99
CPU Cooler - EVGA Superclock CPU Cooler - $49.99
Motherboard - ASUS Maximus IV Extreme - $$289.99
Memory - Corsair Vengeance 16GB (4x4GB) DDR3 1600 - $98.99
Video Card - ASUS ENGTX580 1.5GB - $499.99
SSD - Crucial M4 128GB - $174.99
HDD - Seagate Barracude 6.0GB/s 2TB - $119.99
DVD Burner - Lite On Combo Drive - $17.99
Blu Ray Drive - Lite-On Internal 12x Drive - $59.99
Monitor - ASUS VS248H-P 24" LCD - $199.99

$2116.88. Couple hundred more than what you had, loads better in performance. You could always go with a pre-fabbed water cooling kit such as the Swiftech H20-X20 kits, they look nice.