Im im the same boat buddy. My pc has aged but still is very capable, im waiting until COVID is more or less settled aside to build a new one because of the shortages in stock n delays in transportation.
If your pc can still push modern games and not die, id say wait, theres a lot of folks in that boat so you wouldnt be alone.