I don't think I'll convince myself to spend over $400-500 (or value equivalent) again... I didn't like spending as much as I did on my 2XL, and the features just don't seem worth it to me. I'm also holding on to the 3+ year mark this time around... my last couple phones really haven't been much of an improvement...
Nexus 4, Nexus 6p, Pixel 2XL... each has mostly been out of frustration with failures from the prior generation's battery failure (the Nexus 6p caught fire at the repair site for a battery replacement). TBH, I feel it's time to require user serviceable batteries for all electronic devices with a rechargeable battery, leaning into right to repair on this.
You won't have any issues with a lack of updates for a long time, as they're automatically built in the CI for the model and shipped to you via OTA updates.
Here's the list of viable phones (anything not on this list I wouldn't consider, in the Android world, anyway): https://download.lineageos.org/
Have been a happy user for a few months.