Choice of next phone after N5X?

Choice of next phone after N5X?

So it's time to upgrade, I think :D

I've had the Nexus 5X 32GB 2700mAh for a year (July 2016) and I'm always keeping a 6400mAh powerbank with me. I travel and hike, and I am on-call 24/7. I recharge on every occasion I have to avoid that low % stress.

You might guess I want a more battery efficient phone, but with just as good front and rear cameras and software. I take lots of pics of food and snap/selfies with my black cats in low-light. It's what I do.

I've had my eyes on Zenfone 3 Zoom, Moto Z Play, Huawei P10, but I try to keep the pricetag around $400-450 so I'd love to hear experiences of upgrading in the same price range without getting a worse camera. I also thought of waiting for the S7 to price drop or get a second hand one.

What do you guys think would be a good upgrade?