Consider upgrading now or hold off until the 4000 model arrives.
The latest Ryzen models are scarce because of the pandemic. They're also expensive. I think it's better to hold off until the next generation arrives.