Would prefer that it would have expandable storage and removable battery
Sadly this excludes a lot of phones. The trend is just, sadly, going the other way. If you're prepared to compromise, you should get a Nexus phone. They have always been the most reliable Android phones in my experience, and they give you a true "vanilla" Android with quicker updates than any other brand, since they're made by Google.
The 5X (cheaper) and 6P (premium) just came out (or will come out very soon):
https://store.google.com/category/phones
TechRadar on pricing: http://www.techradar.com/news/phone-and-communications/mobile-phones/nexus-5x-price-1305303