I like your profile picture and agree what you said.I would wait because your Ryzen 5 2600 is still a good CPU.
Also if you have a B450 or X470 board the new BIOS versions that support the Ryzen 3000 series CPU's are still buggy.
I also have a Ryzen 5 2600 and I plan to keep it for at least another 6 months to a year.
At that time I will most likely get either a 3600, a 3600x or a 3700x depending on which one gives me the best bang for my buck.