Have a look at dmxdimension - if you use the 10% off code, pick the most expensive one and spec it up with the details you've given you can get it down to £1556 (with 16GB instead of 12GB and a KillerNic).
I'd probably avoid the upgrade to Windows 7 Ultimate (£120) - get the Windows 8 Pro...