Hopefully that is the case, that's usually the only time I upgrade when the next is at least twice as fast.
That's my mantra too.
Double GPU performance so 3080 is on the cards.
Already had a 6 core CPU for 4 years so now going 12 core

Might as well get 32GB RAM too even though 16GB is still plenty.