With a kind of modern i7 somewhere around 4.5 and beyond I wouldnt upgrade either.
Time will tell if an 4.2GHz 12core will outperform a 4.5-5GHz 6 or 8 core.
With Vulkan and possible mGPU in mind it was wise to not bet on a 20-lane horse but consider something that can truely fire 2 x GPU and a bunch of NVME’s, all with their native speed w/o compromising other hardware in use.
This means either a WS class chipset from Intel or AMD.
I have now had 3 x Desktop style boards after a decade of WS parts and I wanna go back more sooner than later. Limitations everywhere you look.