The build looks solid with a clear upgrade path for the GPU, that would definitely be the spot that would need an upgrade around the 2 year mark to keep up with newer games. I agree with the 1600 option, as that is some more future proofing. Any current GPU used with that CPU will have no bottleneck.