The Sony Xperia Z5 Compact was my previous phone that I'd had from 2015 until mid last year. It was close to perfect. Waterproof, headphone socket, SD slot. If a new version of that were released with less of a screen border than the original I'd buy it in a heartbeat.
Thickness could stay the same too, I'd like the additional runtime rather than everything needing to be wafer-thin.