It will most likely depend on how many improvements are made from the X to the Xs... and whether or not there is a Plus version. I'd have seriously considered the X this year had there been a Plus. Not everyone out there thinks the Plus is too big... it's perfect for me when it comes to everything from texting to watching videos.
Since I didn't have that option it was an easy choice to go with the 8 Plus. As for using it 2 years? I dunno. I used the 6 Plus and 6s Plus for the last 3. I somehow manage to sleep at night too using this "outdated" phone design and even still manage to have sex on occasion. My girl doesn't care what kind of phone I use... although she'd probably dump me if I got rid of the Challenger.
To answer your question though... the lack of an X Plus carried far more weight in my decision. I'm sure I'd like the OLED but please, lets not for a minute say that it's leaps and bounds better than what's on the 8 Plus... because we both know that isn't true.
I've seen many X users complain that Face ID is slower than Touch ID... so somehow I don't feel as if I'm missing all that much with that either.
Notch? I dunno. Maybe I'd get used to it.
I've never said the Plus is better... I've just repeatedly said it shares the same hardware as the X which is 100% fact. The X has a few additional "features" that aren't enough for me to consider it leaps and bounds better than what I have... and when you look at the hardware, that is true.
The differences (Face ID vs Touch ID, OLED vs LCD, camera, animojis) just don't do anything for me. I don't know about you but as far as I'm concerned the cameras are good for Facebook photos and that's about it. If I was a professional photographer looking to make a purchase I'd be looking at a Nikon or something... because there are far better cameras out there than a cell phone.
Besides, it's not like you are taking photos and saying "Hey look! That was taken with a dual OIS camera!"
C'mon man.