Should I upgrade?

G'day G'day,

I'm thinking about upgrading at some point in the next year to take full advantage of the next generation of CPU/GPU architecture that AMD and NVIDIA are putting out for games like Monster Hunter Wilds and GTA6 as well as maybe Killing Floor 3. Currently running a Ryzen 9 3900X and an RTX 3080 so I'm just wondering, should I upgrade everything now or upgrade my Mobo/CPU/Ram and leave the GPU for when the prices come down again?

Cheers