Never Samsung again

I'm due for a new phone soonish. I've had so many Samsung phones but I'm done.. Never again. The note was appealing but I don't want to risk the same ol crappy software and bugs that take way too long to get parched.

I'm waiting for the new nexus, but what are some options available right now that comes close to the hardware benefits of the s7?