Advice for an ugprade to bridge till AM6

Hey, maybe you have some advice for me.

I mostly bottleneck in Cities Skylines 2 or when I am transcoding videos with handbrake. This happens even though I use the AMD HW encoder setting.

Due to memory shortage of DDR5 I plan to re-use my DDR4 DIMMS.
I want to bridge the time till the AM6 socket arrives.

I currently own the following system.

• Corsair Obsidian 750D Airflow Edition
• AMD Ryzen 7 5800X
  • Noctua NH-U12A
• X570 AORUS ULTRA
• 4x KHX3000C16/16GX = 64 GB running at XMP 3000 MHz
• AMD Radeon RX 7900 XT
• 1x Crucial T500 2TB PCIe Gen4 NVMe M.2 SSD
• 1x Samsung SSD 960 PRO 512GB
• Corsair HX1000i 1000W PSU

I am normally an AMD boy but I was thinking to only spend 500 bucks or so by upgrading to something like this:

• 150-250 CHF - Used Gigabyte Z690 Ud LGA 1700, Intel Z690 (DDR4), ATX
• 316 CHF new - Intel Core i7-14700KF
• New AIO Cooler or re-use the Noctua with new mounting kit (free)
  • 360mm AIO should fit in my big tower...
• Re-use: GPU, Disk, Case and power supply (maybe cooler?)
• Sell: Old Mainboard and CPU (sell for 250 CHF?)

Do you have any advice? is my idea sound? It would not cost me a lot and give 30% more single core and 80-100% more multicore performance.

I will build something completely new with AM6.