So my main rigs Steel Legend B450M means I'll be waiting until next year, which will hopefully by that time will have seen the second hand market reset enough to give me a decent 2000/5000 series GPU and a Ryzen 7 3000 series CPU for decent money.
I think my next upgrade is going to be a monitor so will adjust my performance requirements based on that as my, probably, 10-year-old monitor is due to be replaced..