Thanks for the suggestions so far. I didn't consider the Mi6 and a few other Xiaomi phones becasuse I was using an old GSMarena saved search where I specified band 28 had to be in the phone, but I don't actually need that band now.
Aaargh, the Mi6 (and upcoming 6X), Mi Note 3 and Mi Mix 2 all...