>>717703434 (OP)
>wait or upgrade the CPU now?
it all depends on if you want to also upgrade your GPU now and if you intend to still stay on AM4
if you don't want to or cant also upgrade your GPU, then either wait, or get a cheap more powerful replacement CPU that won't be too much of an expense but will also remove that bottleneck, like the 5600(not X, not G), they're around 100-120 dollars/euro.
Getting any CPU that is more powerful than that without also upgrading the GPU, you'll just leave performance on the table(on the CPU side) while also spending more than you need, even more so when if you stay on AM4 now it likely means your next upgrade will be on AM5, so whatever CPU you upgrade to now will not be compatible.
if you instead can also upgrade the GPU but want to stay on AM4, get a 5700X3D if you're going to upgrade to a higher tier but still mid tier card(4070 max), or a 7800X3D if you plan to go higher with the GPU(4080, 4090, or any 50XX card).
If you instead can spend as much as you want, just to AM5 right away and get whichever GPU and CPU you can afford, at the moment there really isn't any wrong high tier CPU + GPU combo, all of them will be more than enough for whatever you wanna play
