Worth Upgrading from 5700X to 5800X3D?

Running Linux Ubuntu. - 7800XT - 5700X - 32GB 3600 MHz RAM - Gigabyte A520M S2H - 1TB SSD - UWQHD Monitor (3440x1440)

Playing games like Helldivers 2 and Cyberpunk 2077.

Considering the following options:

• Not changing anything
• Staying on AM4 and upgrading to a 5800X3D (about £230)
• Upgrading to AM5 with a 9600X + Motherboard + RAM (about £500) or a 9800X3D (about £700)

I guess the questions I'm asking are:

• Is upgrading from 5700X to 5800X3D going to be significant?
• Is it worth waiting on AM4 until AM6 is out in a few years time?

Thanks for all the help guys. I'm going to wait on it for the moment. If a good deal comes up on the 5700X3D I'll swap out my current CPU or if a good 9800X3D + mobo bundle deal comes up I'll upgrade to AM5. For now tho, the CPU still runs strong enough to handle most things in High+ graphics, so waiting for a deal is best move in the short run.