I was, to a lesser degree, on the same path as you (Nexus 4, 5X, Pixel, Pixel 2 currently). Almost signed up for Fi, but decided not to after talking to a few people.
My next phone will be an iPhone, for pretty much the reasons you stated. As soon as they launch 5-6" iPhone with an OLED screen that doesn't have three goofy looking cameras on the back, I'm in.
That may be the case, looking into it again. I might have been mislead by Apple's proprietary marketing terms for their screen (what the hell is "retina" anyway?)
My next phone will be an iPhone, for pretty much the reasons you stated. As soon as they launch 5-6" iPhone with an OLED screen that doesn't have three goofy looking cameras on the back, I'm in.