Xperia z2 replacement

After 2 years my z2 is up for replacing.
Checked all phone reviews and this is my thinking.

Samsung s6 - not waterproof but otherwise good
Anything with snapdragon 810 - avoid

Surely more options than this. Dont really know whats arriving soon, any ideas?