I Agree with Firewrath except that, if you don't mind making a much more agressive fan curve and you aren't a stupid fanboy (no matter the company they are terrible), you could change your GPU to a 5700xt.
Also you could spare the RGB in the ram for x570 in the budget and even double ram, if you want the crazy high amount.
List https://uk.pcpartpicker.com/list/3wmHQq