My advice would be to get the Moto x pure. Samsung devices, if you leave them stock without rooting etc will start to lag and glitch in my experience.
You can also take a look at the LG G4 or the new Nexus 6p. But based on what you have said I think the Moto x pure is the phone for you.