So here is the PC build I have (PCPartPicker). I have a case which I will be upgrading regardless so I do not need help with that.

​

What I need:

-Upgrade GPU; Was thinking of going to a GTX 4070. The 4060 is less than what I want, and a 4080/4090 seems to spending. I'm willing to do 500-900$ on a GPU. I just want to know I am getting a good upgrade from my 5700 XT. I am also willing to go with a AMD 7800 XT if you think that would be better bang for my buck. I do need at least 2 HDMI ports as I run two monitors.

-Upgrade RAM; Only if it's necessary. I'd like to go with 32 GB of RAM, but not sure what I should get to go with my CPU. I remember when selecting that CPU I was told it can be picky with what RAM it wants to work with. Willing to spend up to 200$, assuming that'll get me to 32 GB.

-SSD; Wanting to upgrade to 2TB. Should I just get the 2 TB version of the current SSD I have?

-Upgrade PSU if it's required to meet the new wattage I might have with a new GPU/RAM/SSD.