So I bit the bullet and decided to upgrade my rig one year earlier since we won't have a new node in 2024 anyway. Well, build an entirely new one more like, since I'm swapping just about everything except for the SSD and a few RGB fans.
Everything is bought and on its way except for the GPU and the CPU fan (which I had bought from a third-party marketplace and it's delayed...). Now, fingers crossed I don't miss a discount later this week for the GPU.