You can stay with great 5 3600
Change GPU to RX5700XT whatever model you want (because your budget I suggest MSI)
MoB Asus Prime-P
So Ryzen 5 3600 160$ + MsiRx5700XT 360$ + Asus X570 Prime-P 160$
With 680$ you are Great
Cut from PSU
Buy 650watt
Choose Cheap Gskill Ram etc
I think with this way you don't need to upgrade in the future for a long time and you are with the last word of technology... Pcle 4 etc..
With 100 $ more... And if it is necessary...