Personally, I'd go the Sony.
I became a fanboi after the Z1. (previously was a samsung fanboi, but I'd never buy another)
Same, really like my wife's Z3 compact, current S5 will probably be the last Samsung I use for a while. Having said that just played with an S7 today... damn it's responsive