Personally, i’d go for the AMD rig, as its an easier upgrade path in 2-3 years time. also as Ixenn said, the 1tb drive will eliminate any storage probs. For what its worth, here’s the specs on the system i built about 18 months ago -
Aorus X570 Elite Mainboard
Ryzen 5 3600 CPU
Arctic Freezer34 Esports Duo CPU cooler
Corsair Vengeance RAM(16gb@3200Mhz)
Gigabyte GTX1660 Super Graphics card
512gb Gigabyte nvme (Windows and WoW)
4tb Western Digital Green (everything else)
Runs everything i can throw at it, good luck whichever system you choose