I am in that situation right now. I plan to upgrade it on december during christmas time. I plan on sell my old setup.. even though it should be around 1/6 of the original price, i pretend to buy the GPU with it.
My main concern is what architecture i will get, i don't know if those i7 are worth it. Ryzen seems to be quite almost the same and it's around 400$ less than intel built systems.