Considering the cost of complete new system, I'd just go for the 7950X myself. Saving $100-200 on the CPU doesn't seem like a good value anymore, when it's going to be providing me with years of service. Those extra cores will come in handy when running VMs, compiling code, etc. Power efficiency looked good too when the power limits are tuned appropriately. What I don't like are the new motherboards and where DDR5 is at the stage, so I'll continue to wait for the next generation. The B650E boards seemed like the best compromise to me based on AMD's requirements, but manufacturer implementations may leave something to be desired. The platform as a whole just isn't mature enough for me.
P.S. My wallet would like to know if there's an option to hide these threads.