Looking to upgrade from R9 3900X, not been keeping up with CPU's for a while

I've had this CPU for about 5 years now and it's starting to show, I've upgraded most of my other parts and I'm starting to wonder if I should upgrade to AM5. There's come good deals on DDR5 Ram and I no longer need a motherboard with WiFi built in.

I'm currently running a 4070 Super TI - MSI MAG X570 Tomahawk - G Skill Trident 32G (2x16) DDR4 3600Mhz CL18 Ram and the R9 3900X. Is it a good time to upgrade?