You'll see more benefit in more games with the Rx 480. Hold off on the CPU until after AMD has released the full Ryzen lineup. It could push down the pricing of quad cores with hyperthreading.
For now I'd say get the Rx 480 and overclock the FX-8120.