AMD has just provided some details on its upcoming Zen 4 (Ryzen 7000) desktop offerings. Up to 16 cores, 32 threads with DDR5 memory and turbo clocks over 5GHz. There will be 3 motherboard streams, the more capable offering PCIe 5.0 lanes for storage. All in all a significant uplift.
Q4 2022 should also see the introduction of new Intel CPU. Likely a refinement of its recently introduced models. Quite possibly with up to 24 cores (32 threads).
If you can wait, you will likely be able to get a significantly more capable system with the budget available.
The current Ryzen platform is at end-of-life. While still very capable, it's full upgrade path is known and available today.
If you decide on purchasing now, something like the following meets your requirements. There is a fair bit of room for a decent GPU.