So, I did end up getting the iPhone X. The screen size and quality, as well as the camera advances meant that it was time to retire the iPhone 6. I'm loving the option of a lens that's not so wide, as well as the sensor quality (great range of tones in the shot below), plus the extra video capabilities.
