Upgrading from a HTC One M8. Looking for a good upgrade.

So I saw the LG G5 and Samsung S7 news today and thought I would look for an upgrade for my current phone. I'm not really looking for the best but I would like to know what would be a decent upgrade from my M8. So, I use my phone primarily for streaming both music and video but I also game quite a lot. I'm not picky with expandable batteries or storage but it's always a plus. Screensize should be comfortable, nothing overkill like the notes. Batterytime is also not so important since I feel like most phones are similar regarding the battery. I've looked at the oneplus two / three as well as xiaomi's phones. What do you guys recommend?