New Build Advice Needed

[BIOSphereXx]

Budget: <= $2k

Country: USA

Purpose: Photo & Video Editing, Gaming (VR), Programming & Web Surfing

 

I currently have a budget PC that I built 5 years ago. It still functions but barely. (ie. sounds like it is suffocating under minor loads)
 

Here is a list of my build picks so far:

Intel Build

AMD Build

Current PC:
MSI GeForce GTX 970

AMD FX-6300 Vishera 6-Core 3.5 GHz

MSI 970A SLI Krait Edition

CORSAIR Vengeance 8GB (2 x 4GB) 

EVGA 750 Power Supply

SAMSUNG 850 EVO 2.5" 500GB

1TB Hard drive for extra storage

[Potatocell]

id go the 3700 route with a x570 or a B450 board 16gb ram, a nice PSU, that new GPU you want, should be killer and in that price range. Personally I don't mess with micro builds so idk about that stuff but the new cards seem to be big unless its just the 3090 so how well would that fit in a small case. Maybe Zotac will come out with a mini version 

[BIOSphereXx]

Yeah, I am willing to give up the Micro ATX size for the performance of those new GPU's.