New desktop workstation for mechanical engineering study

I started a topic for a new workstation laptop about a week ago (https://forum.solidworks.com/thread/34370), but in the process of looking for one, I changed my mind: instead of buying a workstation laptop I'll buy a workstation desktop + very basic laptop.

I made an assembly at a dutch webshop (I live in the Netherlands) that fits the budget (€1600 for case + mouse + keyboard) quite reasonably and I was wondering what you think of it.

http://img145.imageshack.us/img145/7821/samenstelling2.jpg

I know the processor isn't very fast, but it's by far the best bang for your buck Intel Core i7 on the LGA1366 socket, atleast for now. It will be the first upgrade I'll make, but it will probably be more than fast enough for me coming from a laptop with an Intel Core Duo T2300E.

SolidworksAdministration