Should I upgrade now? or should I wait?

I have a question about upgrading my system, I built this computer on a budget over two years and a half years ago. For the beef of my system I have an AMD FX 8350, and an AMD Radeon HD 7870, I am by no means an AMD lover, I simply went with them at the time because they offered the best bang for the buck. My question basically revolves around whether or not I should upgrade my computer now or later. I have been keeping up with the latest release dates for new tech as well as their specs, and it would seem that AMD has some new stuff rolling out somewhere around Q2 2016. As for Nvidia they have cards lined up for 2017, and Intel just released their 6000 series so I presume we won't see a new generation within the next year, if anything it would be late next year. Now I want to upgrade, but with the information surrounding AMD's new processors (Zen) and their new graphics cards (Greenland) I am curious if I should hold off to see what those have to offer exactly. I know that most people don't expect Zen to outperform Intel's biggest guns, and I think that might be an honest stretch myself, being that they are redesigning their architecture entirely on a new socket (AM4), utilizing SMT (Simultaneous Multithreading), which is the principle Intel uses on their processors referred to as HyperThreading. So their is a lot of new ground for AMD to walk on, and when it comes to making that first step it usually isn't the best stride. As for what AMD has to offer in regards to their GPUs I am certainly very eager to see what they have to offer. Further pushing the limits of technology their Greenland cards will use 14nm technology, increasing performance, lowering heat, increasing available real estate, and having on-board memory capacities of 16/32 GB? It sounds like it really could be something worth waiting for, I am just curious what you guys think, and if you guys have any input. Thanks in advance!
Links (GPU): http://wccftech.com/amd-greenland-14nm-production-q2-2016/
CPU: http://www.digitaltrends.com/computing/amds-am4-platform-may-launch-soon-march-2016/
Tl;dr Have an old gaming rig, looking to upgrade, should I wait for AMD's new CPU's and GPU's