Wait for the Scorpio, and if you haven't already, get a good monitor/display. Those GPU's you keep investing in every year or so, are money sucking you just to keep up with the latest and greatest, and will cost every bit as much or more as the aforementioned Scorpio/display.
I do have my eye out for the Scorpio and will likely buy one, budget withstanding.
How often when you buy a PC game, that you look at the min/requirements to run it, and cross fingers that your pc will run it the way you want it to?
I only ask myself that question with golf games on the PC. Why, because every other game I play on it runs at ultra settings, 1080P, at 60 FPS to 140 FPS. The Golf Club and Perfect Golf are the only two games I play on it that I have to back graphics settings down to stay above my personal minimum - 45 FPS.
With console, (and especially the Scorpio, which sounds like a beast machine) you need not be concerned with the lack of GPU etc, etc... just throw the disc in or DL and go. How good is good enough for you?? When will it stop? Just a little therapy for you
I'm sure the Scorpio will hold up quite well in the future proofing realm. I just love consoles and their integration, although I admit I play games on my PC probably 70% of the time now. Forza 6 on the XBox One gets the lion share of my console gaming, but I can't wait to see Forza 7 on the Scorpio!