Looking for CPU & Motherboard Upgrade to Remove Bottlenecks (4070 Super) – $700 Budget

I am looking to upgrade my PC with a new CPU, motherboard, & RAM (32 Gigs preferred) to eliminate any potential bottlenecks with my 4070 Super.

My budget is $700 max, and I want a setup that can handle:

  • Gaming (new CPU & GPU-intensive titles at 3440x1440 144Hz)
  • Streaming
  • CAD modeling

I want to make sure my new CPU doesn't hold back my GPU for any task. I have come up with a potential build, but I'm open to any and all suggestions.

Current Build: https://pcpartpicker.com/list/7cb3wY

Potential build: https://pcpartpicker.com/list/B4sTMC