I'm currently considering either the S8 or Oneplus5 (5T if just round the corner) but I would have liked to stick with google. I had the N5 and now the N5X. I have always had pretty poor battery life out of my 5x but forgave it due to the speed it ran and clean interface, not to mention the update cycle. I used past tense "ran" there as since I upgraded to 8.0 my 5x has started running like a dog. I have tried clearing the cache but not difference. I must admit there is a fair amount on it, so I might (if I can summons up enough enthusiasm) do a factory reset and start adding apps I use back one by one, but its a ball ache.
I am a little loathed to move back to Samsung, I had an S3 an hated the bloat and Samsung's general interference with Android, but the S8 does seem like a pretty polished piece of kit and is now hitting the £500 ish mark. I seriously considered getting the Pixel1 XL when it dropped to 400 quid but hesitated and now that boat has sailed.
The Pixel 2 is a bit of a miss for me, it ticks all the internal spec boxes but the high price and a very 2014 appearance kinda make me think I'll pass.