Note 3 (Note series in general) Replacement Phone

i currently have a Note 3 and love it, but have been interested in getting a new phone. My obvious choice was to go with the Note 5, but then i learned that i cannot replace the battery or add in a microSD card and that is a no-go for me. A lot of people are just calling us whiners, but the majority of my phone's use it for listening to mp3s. If i can't load up my phone with mp3s, then it is an absolute no. i also like being able to take out the battery to replace it in an emergency or when my phone locks up or freezes.

So i am thinking of just getting the Note 4 and seeing what Samsung does with the Note series. Does anyone predict they will come out with a new edition of the Note 5 or possibly bring back these features in the Note 6?

i have been happy with HTC in the past, i am also considering switching back to HTC.

Thoughts?