It seems like what you're looking at is decent. That being said, I feel like this is a semi-bad time to buy. If you could limp along with that machine for another six months to a year you'll probably be able to build a better system at the same price because the weird market distortions will have gone away and Intel will hopefully be back in competition with Alder Lake. Also, Intel Alder Lake may support DDR5, so you could just skip DDR4 entirely and go straight to a DDR5 platform.
The problem right now is that you can't even buy a GPU which defeats a lot of the point of upgrading. Maybe at a minimum start looking for a GPU and hold off on the rest of the build until you actually manage to get one, which could be a while.