We have a nearly identical setup. I have a 7950X3D and have been happy with it so far. But I’m eying the 9xxx3D as well with a 5090. Perhaps that combo will get us back to 2020 performance 
I haven’t benchmarked the CPU but I have LOD 200, running native Crystal resolution on DLSS Quality and locked at 36 with passable Smart Smoothing. I’m surprised you can’t run full resolution at 36 FPS.