I really want something 13 mini sized but the battery life is no good for me. They could fix that with less fat and bloated software but like hell that's going to happen.

The last phone I really liked was my iPhone 6s. Right size, shape and feel. That was incidentally the last phone that had a camera that didn't oversharpen everything too.