I'd hold off until the upcoming switch where Etherium goes to PoS which should lead to price drops across the market.
Sorry but I had to laugh. I feel like that’s the same as waiting for the chip shortages to ease. A very mobile goalpost.
A 6600/6600xt/3060/2060 12GB are all huuuuuge upgrades. I mean, like a decades worth. The price might be stunted but his card is unreasonably valuable too.
I would stay AMD for the FreeSync ease, and aim for a 6600xt which is pretty clearly faster than the Nvidia options below the 3060ti.
I think the performance differences are arbitrary given the massive uplift, however. Just know you might be stuck with what you buy for a bit (this is how I talked myself into a 6800)
Lastly... I think things will be rough if you only upgrade the GPU OR do what others have mentioned and upgrade the board/cpu/ram. I used a 290X in the rig below between selling my 5700XT and getting my 6800 for about a month and while yeah, minimum frames were better it still was a noticeable and big step down from the 5700XT on settings I could run. I had to turn things down significantly and still deal with much lower frame rates.
On the flip side, I upgraded to to the 5700XT while staying with my trusty 3930K (Six core, sandybridge, extra memory bandwidth) that was pretty solidly overclocked. The highs were great, the benches solid... the gameplay meh. Huge frame dips on physics events, etc. really made me question the big at the time ($350! lol!) investment.
Getting to a mid-level platform sold in the 2020's is worth it!
If you could get to a 5600X/12400/3600/10400 you'd be that much happier with the GPU upgrade AND be W11 ready.