I would suggest waiting just a bit longer, Zen+ is just supposed to launch (2700, 2700x etc.) and while the performance increase is not expected to be more than 10-15% it should also contribute to lower last gen prices if that’s more interesting rather than a slight performance increase.
Overall Ryzen tends to be a powerhouse when it comes to anything multi-threaded, however it falls a bit behind at single-threaded workloads (gaming etc.). Overall it’s best for you to look at your specific usecase and go from there.