Which Android Phone should I buy?

[AC Question]

For the past two years, I've been using a Samsung Galaxy S4 Mini. It was my first Android and I loved it. But now it's slowing down and it's battery is plummeting. In about a month's time I'm prepared to switch to a new Android, but I don't know which one.

The things that matter most to me are:
-Battery Life
-Storage Space
-Android 6.0/6.1
-Price is preferably under $600
-Available in Canada eh?

Thanks in advance for your time.