I had the same situation with the S10e. I don't know how it compares to the Moto X4, but with the increased sized phones I have no interest in a new Android.
I only got this one because I couldn't find one smaller.
At the current rate I would have to move to iPhone just to stay a similar size.