After saving up money for a while I bought myself a new desktop PC. Its main purpose would be gaming and some development stuff but since gaming has a big influence on the parts, I rolled with that. Here is the part list I ended up ordering.
Specs! Intel Core i5-6600. Asus H170 Pro Gaming. 256GB Samsung SM951. 2x 8GB Kingston Hyper-X 2133MHz DDR4 MSI R9 390 8GB. Seasonic G-Series 650 Watt.