Well, that's the only CPU upgrade that makes sense: the 7800X3D. I don't think it justifiies a full new build. It kicks butt in the latest Techpowerup gaming benchmark roundup, but I surmise that's because the games they bench almost all benefit greatly from 3D Cache (when most don't), because otherwise, in nearly all benchmarks, there's not a significant difference between the two. Huge cost for nothing much. I'd recommend waiting for the new GPU upgrades and a CPU that meaningfully thumps on the 5800X without gimmicks.
A bit of patience is on your side because in that time the Gen5 SSD prices will continue to tumble, and performance in that class is still expanding quickly at the same time. The value sweet spot for DDR5 RAM frequency should also rise. Global inflation is supposed to be under control, so hopefully you don't get burned there.