I have no plans of leaving the Apple ecosystem either. iPhones are tanks… well, maybe not as tough as our resident @Tank, but, heck, my iPhone 3GS still powers up and I’ve never had any issues with it. I still have my iPhone 6S to use as a test device and it also keeps on ticking (sorry, that sucks about your battery, though!).
However, I might sit out the upgrade this year. My iPhone X still runs great and I don’t really need the wide angle lens (I thought the normal lens was too wide at times and was happy when they added the telephoto lens!).