Just like in my case, pretty much whatever you will purchase will be a pretty big improvement from what you got now.
The main difference from back then is that you must pay serious attention to cooling (both for Intel and AMD) as in both cases modern CPUs will attempt to use as much thermal space as you will provide, so spending more on a serious air cooler (or an AIO if you fancy that) will provide benefits.
Fanboyism and benchmarks aside, the current gen of both AMD and Intel seems to be pretty comparable and if you buy a 12700/5800 level you will have a pretty good experience, with Intel possibly having some minor issues with older software (due to the fancy new mixed core architecture) and AMD being a little more picky with RAM (you can get better performance with faster memory and some fine tuning), on the GPU side AMD and NVIDIA are pretty comparable on raster FPS at the same card level, however expect to pay a premium if you care about ray tracing (NVIDIA does perform better), especially in the current market conditions.
For Intel, you might also get a little better performance with DDR5 but expect to pay more for RAM and motherboard, it could be good if you plan to add more later, otherwise IMHO I'd get a lower tier motherboard and splurge on DDR4 RAM (although fellow forum members might have a very different opinion).
My personal strategy right now is to wait for a good deal on a GPU (the hardest part to get at a honest price right now) then buy everything else as prices for non-GPU hardware seems to be more stable.
It pays to keep up to date with newer hardware, personally I found Tom's Hardware review pretty good, especially for GPUs (I follow Jarred Walton since his PC Gamer time), however I'm sure others will be more than happy to provide their favourite reviewers.
Good luck in your upgrade search!
