I would first wait for the new Ryzen series. Your system is not that old. An update of the components mentioned would give you a good performance boost, but in my opinion nothing earth-shattering in real-life applications.

Stockerivo. If you need or want something new, do it now. For PC components, you can wait forever. The manufacturers don't sleep. And with Ryzen 3000 series we don't know what the performance will be. It could be that it has "only" 10 or 20% more power!? Ryzen 3000 release is around 3Q 2019 and until they sell it takes time. Then come the new Intel etc... it can take time. You can always wait.

Greetings...