Upgrade or new build

[Pirouetteandco]

I have somewhere around a 1000 CHF to spend and I live in Switzerland

 

I have this 

PCPartPicker Part List

Type	Item	Price
CPU	Intel Core i7-3820 3.6 GHz Quad-Core Processor
CPU Cooler	Noctua NH-D15 82.5 CFM CPU Cooler	$89.95 @ Amazon
Thermal Compound	Coollaboratory Liquid Pro 0.15 g Thermal Paste	$16.73 @ Amazon
Motherboard	Gigabyte GA-X79-UD3 ATX LGA2011 Motherboard
Memory	G.Skill Sniper Series 8 GB (2 x 4 GB) DDR3-1866 Memory	$52.99 @ Newegg
Storage	Samsung 850 EVO-Series 120 GB 2.5" Solid State Drive	$94.99 @ Amazon
Storage	Seagate Barracuda 2 TB 3.5" 7200RPM Internal Hard Drive	$88.50 @ Amazon
Storage	Western Digital BLACK SERIES 2 TB 3.5" 7200RPM Internal Hard Drive	$112.99 @ Amazon
Video Card	EVGA GeForce GTX 670 2 GB Video Card
Case	Cooler Master Storm Enforcer ATX Mid Tower Case
Power Supply	Corsair CX 500 W 80+ Bronze Certified Semi-modular ATX Power Supply	$118.99 @ Amazon
Optical Drive	LG WH14NS40 Blu-Ray/DVD/CD Writer	$49.88 @ Other World Computing
Operating System	Microsoft Windows 10 Home OEM 64-bit	$99.99 @ B&H
Wireless Network Adapter	Asus USB-N53 USB 2.0 802.11a/b/g/n Wi-Fi Adapter	$104.98 @ Amazon
Keyboard	ROCCAT Ryos MK Pro Wired Gaming Keyboard
Mouse	Cyborg CCB437050002/04/1 Wired Laser Mouse
Headphones	Logitech G35 7.1 Channel Headset	$255.31 @ Amazon
External Storage	Western Digital Elements 2 TB External Hard Drive	$89.99 @ Adorama
Custom	Controller Logitech F310	$39.90
Custom	Joystick Logitech 3D Pro	$69.90
Custom	ASUS RT-N66U, n450	$104.00
	Prices include shipping, taxes, rebates, and discounts
	Total	$1389.09
	Generated by PCPartPicker 2020-01-24 07:48 EST-0500

And i think something like this would be good 

PCPartPicker Part List

Type	Item	Price
CPU	AMD Ryzen 5 3600 3.6 GHz 6-Core Processor	€203.85 @ Amazon France
CPU Cooler	Noctua NH-D15S 82.52 CFM CPU Cooler	€79.90 @ Amazon France
Motherboard	MSI B450 GAMING PRO CARBON AC ATX AM4 Motherboard	€154.47 @ Amazon France
Memory	G.Skill Trident Z RGB 16 GB (2 x 8 GB) DDR4-3600 Memory	€123.95 @ Amazon France
Storage	ADATA XPG SX8200 960 GB M.2-2280 NVME Solid State Drive	€256.13 @ Amazon France
Video Card	MSI GeForce RTX 2060 SUPER 8 GB GAMING X Video Card	€451.11 @ Amazon France
Power Supply	Corsair 500 W 80+ Bronze Certified ATX Power Supply
	Prices include shipping, taxes, rebates, and discounts
	Total	€1269.41
	Generated by PCPartPicker 2020-01-24 13:56 CET+0100

I would be buying all my stuff there https://www.digitec.ch/fr/ShopList/Show?shopListId=5AC5D1BBF62385440BEFA3518E2F3A96

 

What do you think is the best choice ?

 

[Fasauceome]

It's a solid upgrade, but why switch coolers from the D15 to the D15S?

[Brooksie359]

34 minutes ago, Fasauceome said:

It's a solid upgrade, but why switch coolers from the D15 to the D15S?

Probably ram clearance and I doubt they have a mounting bracket for their D15 that is compatible with AM4. 

[Pirouetteandco]

37 minutes ago, Fasauceome said:

It's a solid upgrade, but why switch coolers from the D15 to the D15S?

Mostly because i selected the wrong one

[Fasauceome]

4 minutes ago, Brooksie359 said:

Probably ram clearance and I doubt they have a mounting bracket for their D15 that is compatible with AM4. 

Noctua does supply a mounting adapter through their customer service

https://noctua.at/en/which-noctua-cpu-coolers-are-compatible-with-amd-am4-ryzen

[Pirouetteandco]

So you agree it's not worth it to try to upgrade ?

[Brooksie359]

3 hours ago, Fasauceome said:

Noctua does supply a mounting adapter through their customer service

https://noctua.at/en/which-noctua-cpu-coolers-are-compatible-with-amd-am4-ryzen

True but not everyone wants to go through that hassle and that still does not address the ram clearness issue.