I am currently still nursing a Ryzen 2700x

Like usual I've been waiting, waiting and waiting to go on AM5 but I never get there so I was thinking of keeping my current setup and just chucking a 5800x or x3d in

My poor mismatch of parts in this pc is not the best really.
The 6800xt nitro plus is definitely needing some more juice that a ryzen 2700x can never give it

and my psu plus motherboard and ram will be fine with a 5800x /x3d in (MSI b450 gaming plus max + vengeance 3200mhz)
Is the 5800x /x3d worth it at this point. I can't see me upgrading any time soon so I thought I'd ask around and see what others think.