CPU's usually last a long time. I've got a couple over 20yrs that haven't died. You might be waiting a long time🙂
I guess it depends on your finances?
If you've got plenty and want the best, sell mobo,CPU and GPU and go NF4,X2 and PCI-e
If you've got some and want better, sell mobo and CPU and get NF3 and Venice
If you have nada, do nothing and keep what you got:beer: