I'm going to wait and see what the U 11 is like, because it only requires waiting another fortnight (at least until the announcement - seeing the device will probably take longer).
But I am fearing that there's no right choice for me right now, including buying a 10 to replace my M7. Really the 10 is too large for me - I struggle to reach the back button on my wife's 10 without using my other hand hand - but it is the most robust option and probably the best audio. The U 11 is going to be wider, so even being thinner I think it unlikely I'll be able to handle it. The ability to customise the on-screen buttons of the G6, and well as it being marginally thinner than the 10, may make it better for me but I need to try one for real to know. But for that price I'd prefer 64GB storage at least. The S8 is a better size but I prefer to keep phones for a long time and Samsung do have a reputation for slowdowns, plus I have slight reservations about AMOLED longevity. Sony's XZ Premium is too large, and their Compacts are now mid-range devices. Moto don't make anything smaller than 5.5", nor do One+. The Huawei P10 is a mess (a lottery as to the grade of storage components, for example). And the Pixel is asking a lot of money for a 2016 design with no storage expansion (plus it's out of stock anyway).
So I don't know. I may buy a 10, a U11, a G6 or a S8, but none stands out as a clear answer right now. I can imagine it coming down to buying a 10 (because if there's no clear winner I may as well choose the cheapest) or seeing whether my phone can limp on until we see the Pixel 2 (which will at least have software support going for it).