In general, I'd say the graphics card needs upgraded way, way more than the CPU. Zen 2 is aging now, but it's still good enough until you get into the very high end graphics cards.
If you still want to upgrade the CPU later/along with it, I'd go with no less than the 5700X3D (or even the 5800X3D). The reason for that is because making a single generation change often isn't large enough of a change to be worthwhile, but the X3D models are even more of an uplift on top of that. That's also why I';d suggest considering the 5800X3D as well even though it's a worse value in a vacuum. You're not starting from nothing. You're starting from a 3600X. And the 5700X3D is ~7% to 8% slower than the 5800X3D. So relatively to your starting point, there's going to be a bigger relative difference the 5800X3D brings. That might make it worth considering over the 5700X3D if you're going to upgrade on AM4 at all, but I'd only look at the CPU after you focus on the GPU.
For gaming, a good SATA SSD is enough. Most games won't see a big difference from NVMe ones because they're not limited by sequential speed s much. So if you need to trim upgrade ideas to free up budget for elsewhere, that's the place to do it. I'd only get a new SSD if your current SATA one lacks DRAM and is a lower end model or something.