there isnt a cpu/gpu out there yet worth the upgrade from what i made you (based on your budget). that should last you at least 3 or more years.
-the xeon is still a very strong, top of the line processor.
-the r9 390 will last a long while with its 8gb vram. the newest games only take 5gb vram max on 1080p.
those are both high quality parts.