Unless you can't do something with the system you have I would suggest waiting. You have 12nm Ryzen, 10nm Intel, and 7nm Ryzen all coming withing the next year or so. My advise, and this goes for GPU's as well, is upgrade on when you have node improvements. The 10nm Intel and 7nm Ryzen will be long nodes, which the improvements won't change much. Those are the upgrades you are looking for. Hell, it might be the last computer you have to buy for a decade.