Which out of the 2 builds is better

Neurosis

Distinguished
Nov 14, 2010
19
0
18,520
Option 1:

Intel i7 950
Gigabyte X58A-UD3R
EVGA GTX580 SuperClocked
Cooler Master Silent Power Pro Gold 1000W
Corsair DDR3 1600 12GB (6x2GB)

Option 2:

Intel i7-2600k
Asus P8P67 Evo
EVGA GTX580 SuperClocked
Cooler Master Silent Power Pro Gold 1000W
G.Skill RipJaws X {8GB (2x4GB)} X2 so 16GB in total

I am interested in gaming and animation, which includes photoshop as well
Only the ram, cpu and mobo has changed
which would be the best option for me?