The 3600 should be quite cheap now, actually bought one around march / april with a really good x570 mobo. My goal was to stopgap for a few months until Ryzen 5000 would be out, so time to upgrade next month
You're aiming at 1080p gaming I assume, right?
If the budget is not super tight, maybe check the ryzen 5600 (non x) and hold fire until we hear what rdna 2 cards will be out. You're clearly not aiming at the biggest die, but potentially at the budget friendly sku of the new cards.
If you're dead set on getting the old architecture, then going 2nd hand market might be the way, will be a ton of people like me getting rid of good silicone as soon as the new cpu/gpus launch.