Weighing up whether to replace a dead 5900X with a 5700X3D or upgrade to AM5?

I use my computer for Photoshop, Gaming and Blender at about a 70:25:5 split on a 1440p ultrawide with a RTX 3080.

Long story short, I narrowed down my boot issues to the CPU so I’m looking to replace it. I’m leaning towards a 5700X3D since the 5800X3D is $150 more expensive and from what I’ve researched it isn’t $150 more powerful (let me know if I’m wrong or even if I should just replace it with another 5900X)

What I’m also wondering is, is it a good time to upgrade to AM5 or is it still early enough in the gen that I should stick to AM4 and wait for a more powerful/cheaper CPU’s to be released.