Upgrading computer

[vegurr]

Im looking to upgrade my computer, to get a more smooth gaming experience.    

My current specs are;  

CPU: AMD FX-6100 Six Core @ 2921 MHz (3266 MHz TURBO)

GPU: AMD R9 290

Motherboard: Gigabyte GA-970A-UD3

PSU: 500W Silver Power

RAM: 8GB (4 GB DDR3 KINGSTON 99U5471-020 x2)

  

Mainly want to upgrade my CPU and GPU, as well as my PSU.  

I was thinking about waiting for the AMD Zen cpu's to come out, but otherwise I really have no idea what would be good to buy.  

What should buy?  

Ram? is that worth upgrading?

[AyBuild]

Upgrading to Zen is all you need that gpu will last another year or two.