PC upgrade build

[Fnige]

Dad wants a new gaming pc to upgrade his previous one (FX-8150, 32gbs DDR3, GTX 1060) and he asked me to do it

Location: Australia

 

At the moment I got this

 

CPU: AMD Ryzen 5 3600X 3.8 GHz 6-Core Processor  ($339.00 @ Shopping Express) 
Motherboard: MSI B450 Gaming Plus MAX ATX AM4 Motherboard  ($199.00 @ Mwave Australia) 
Memory: Corsair Vengeance LPX 16 GB (2 x 8 GB) DDR4-3600 Memory  ($195.50 @ Amazon Australia) 
Storage: Crucial P1 1 TB M.2-2280 NVME Solid State Drive  ($169.00 @ Shopping Express) 
Video Card: Asus GeForce RTX 2070 SUPER 8 GB DUAL EVO Video Card  ($839.00 @ Umart) 
Case: Phanteks Eclipse P300A Mesh ATX Mid Tower Case  ($99.00 @ PCCaseGear) 
Power Supply: SeaSonic FOCUS Gold 550 W 80+ Gold Certified Semi-modular ATX Power Supply  ($135.00 @ Umart) 
Total: $1975.50

 

He wants at least 16gbs of ram & 1tb SSD (nvme) 

Price should be below $2000

I don't think he wants to overclock

 

Edit 1: Made it a bit more powerful

[Shrekpad]

PCPartPicker Part List

Type	Item	Price
CPU	AMD Ryzen 5 3600 3.6 GHz 6-Core Processor	$279.00 @ Shopping Express
Motherboard	ASRock B450 Steel Legend ATX AM4 Motherboard	$185.00 @ I-Tech
Memory	G.Skill Ripjaws V 16 GB (2 x 8 GB) DDR4-3600 Memory	$145.20 @ Newegg Australia
Storage	Crucial P1 500 GB M.2-2280 NVME Solid State Drive	$104.00 @ Shopping Express
Storage	Seagate Barracuda Compute 2 TB 3.5" 7200RPM Internal Hard Drive	$88.00 @ Newegg Australia
Video Card	MSI GeForce RTX 2060 SUPER 8 GB VENTUS GP OC Video Card	$699.00 @ Shopping Express
Case	Phanteks Eclipse P300A Mesh ATX Mid Tower Case	$99.00 @ PCCaseGear
Power Supply	Corsair CXM 650 W 80+ Bronze Certified Semi-modular ATX Power Supply	$132.00 @ Skycomp Technology
	Prices include shipping, taxes, rebates, and discounts
	Total	$1731.20
	Generated by PCPartPicker 2020-05-01 11:00 AEST+1000

Could save money, for similar build.