I've gotten myself a desktop again, after 8 months with only a MacBook Pro 15".

It's a Shuttle SZ77R5, with an Intel Core i5-3470, Corsair XMS3 1600mhz 2x8GB, EVGA GTX670 (reference-cooler), Samsung 830 256GB SSD and a WD GreenPower 2TB drive for storage!
I have also ordered a Intel Centrino Ultimate-N 6300 wireless network-card with some cables to put antennas on the rear of the case.