I'm at the stage in my PC's life where I need to upgrade.
I'd advise waiting 6-8 months. My reasoning is:
Nvidia's new cards are hard to obtain currently. Equally, getting a 2000 series offers no real advantage in price. As a 3000 series gives more for the same RRP cost. The only thing you'll have to watch out is for the increased power consumption for the 3000 series.
In that time frame the 3060 will be out I should hope, and that's the budget end of the 3000 series. Unless you're doing stupidly high end graphics it should do. Equally there's some quality control issues from the 3000 series at current, and it depends on which manufacturer you go for as to how close to the specs the card you buy is. I'd expect all this to be sorted out in a few months as well.
AMD will get their new series to market. AMD are new to the graphics card game, so their cards aren't as good. However, they've recently developed new technology that lets their new Graphics cards use spare processing power capability from the CPU to provide extra GPU performance. They're also lower power cost cards. Of course, NVIDIA has worked out how AMD has done it and released that info to the public, so it's likely that a modern CPU will be able to (eventually) benefit from it. Also to utilise the feature you'd need an AMD CPU (at current).
So basically, with everything's up in the air, in flux and a confused mess at current. Add in stocks are hard to obtain. Give it time to calm down and you'll be able to get a better idea of the lay of the land, and also quality control issues and price scalping will have subsided.