I think that the One S should be dropped first, followed by the One X, but that the One X shouldn't be anchored to the 2013 console.
So yeah, the One S should be dropped and the One X should be supported further, then be the next to drop say 2 years after. As it exists, it appears that the One X is anchored to the One S.