Same boat (and CPU) as you, but I'm going to wait till the new AMD Zen chips get released before taking the plunge. I've had the same CPU since 2012, so I don't see that a couple of more months will make that much difference :)
Just a note about GPU encoding, I bought a Turing-based GPU, and...