I want to say GPU if you have the money, but at this point I'd wait for it. I'm still sitting on my 1070 and I've had no problems with it yet so it wasn't worth upgrading yet. Hold out, wait a few months after the Ampere drivers get worked on a bit and the prices either drop or different...