I might end up waiting for an Xperia Z5. The camera is amazing along with OIS. It also has awesome design and a fingerprint scanner and a uSD slot. I think it's the only no compromise phone this year.
You might be waiting a while...We all know how Sony is with phones here in the US.
They are released 3-6 months late compared to Europe/Asia, and they've closed up their online shop so you can't buy directly from them any longer even if you wanted to.
Don't be surprised if by the time the Xperia Z5 is released in the US, the One M10 and Galaxy S7 which will both feature SnapDragon 820 already knocking on the door. Hell, by that time even the Xperia Z6 may already be knocking on the doors in Asia(remember that Sony has 6 month flagship cycles, unlike the other manufacturers which only release their flagships every 12 months).
Let's hope that Sony improves their US market timing and also gives people a way to buy unlocked devices directly from them.
I no longer buy phones from carriers or from the black market(Amazon, Expansys, eBay, etc...) with "no" warranty(or "European" warranty which is useless in the US) and I haven't done that in ages. If no phone manufacturer offers that, then I will gladly walk away from them.