I have played with the X in the meantime and it still feels shockingly "first gen" to me. It is very evident that the X was rushed and released an year early as some reports have indicated.. plus the X camera hump is horrendous (the notch is a necessary evil however that I have accepted).
What about the X seems 1st gen to you? I don't get that feeling at all. And the camera hump is the same as the 8/8 Plus isn't it? I know the orientation is different but it's the same hump just flipped.
The 8/8 Plus are still great phones though and I feel this year you can't go wrong with those or the X. Plenty of choices for Apple fans.