Android phone for game development and everyday use

Hello, everyone.

I’m about to replace my old Iphone with an actually usable thing, i.e. an Android phone. What phones would you recommend? So far I’m torn between the HTC One M9+ and the Samsung S6.

HTC: Sweet design, cheaper, not sold in Sweden but available through Ebay so bonus points for being exotic here.
Samsung: Ugly, good reviews, a bit more expensive.

What I want:

  • Timely OS updates that don’t stop after 1 month.
  • Decent GPU for game development but doesn’t have to be top-of-the-line (I don’t game much on it on the move).
  • Not too buggy drivers (Intel doesn’t make phones, do they?!).
  • At least 1920x1080p resolution, but seems to be the minimum nowadays anyway.

My biggest problem with my current phone is how stupidly slow it has become over the years. Any tips for keeping my new phone healthy are more than welcome.

What phones do you guys have? Anything you’d recommend?