Need help deciding MOBO, CPU, RAM

[Sigmandis]

1. Budget & Location
   1. $3,000 - $3,500 US Dollar, USA
2. Aim
   1. I'll be using the system for gaming and video editing. Hour for hour, I expect more time will be on gaming.
      1. Gaming: Overwatch, World of Warcraft, Call of Duty, too long to list them all. I love gaming
      2. Video Editing: 
         1. I'm re-learning my old trade, and starting to make video content again after about a decade of little to no serious editing. 
            1. I shoot primarily 4K footage from a Sony A7Sii, that records out to a Atomos Ninja Flame. I either shoot 1080p 59.94fps, or 4K 29.97fps both using ProRes HQ.
            2. My workflow is entirely in the Adobe Creative Cloud Suite
               1. Audio mastering in Adobe Audition
               2. Video editing in Adobe Premier Pro
               3. After Effects for animations, and adding elements into the video.
                  1. Planar tracking in Mocha AE
                  2. Keying green-screen footage
                  3. Adding pre-made 3D assets from packages such as "Video Co-pilot" into footage
3. Monitors
   1. Alienware AW2518H 25" Gaming Monitor (already on-hand)
      1. 240 Hertz with NVIDIA G SYNC
      2. Used for gaming
   2. Dell U2713HM Monitor (already on-hand)
      1. Primary monitor for video editing
      2. Used a secondary monitor for web-browsing while playing games like World of Warcraft
4. Peripherals
   1. Razer Huntsman Elite Keyboard (already on-hand)
   2. Razer Naga Trinity (already on-hand)
   3. I already have a license of Windows 10 pro I can use on the new system
5. Why are you upgrading?
   1. I need a system that'll give me a great gaming experience, and can be used for some video editing. 

 

Builds I've been Considering

1. Friends Gaming Build (Not sure this would also be able to handle video editing needs, but seemed good enough for an excellent gaming experience. He doesn't have a 240hz monitor though.)
   1. CPU: AMD Ryzen 5 3600X
   2. Motherboard: ASUS TUF Gaming X570-Plus ATX AM4
   3. RAM: Corsair Vengeance RGB Pro 32 GB (2x16 GB) DDR4-3200
   4. Storage: Samsung 970 Evo 500 GB & Samsung 970 Evo 1TB
   5. GPU: EVGA GeForece RTX 2080 Ti 11 GB Black
   6. PSU: EVGA PQ 750 W 80+ Platinum Certified Semi-modular ATX Power Supply
   7. Case: NZXT H510i ATX Mid Tower Case
2. PCPartPicker "Glorious Intel Gaming/Streaming Build"

Aside from self contained water cooling solutions like the Corsair H100i, I'd rather not deal with custom water cooling setups. I don't have the confidence or patience to really build a custom water cooled PC.

I don't mind overclocking, but I'm very inexperienced with it.

 

Both the builds I'm considering are in the $2,200 - $2,500 range so if there's hardware closer to my budget limit that would give me a big performance boost I'd like to know.

 

Thanks for the help!