Storage first, battery life second. I like to carry a lot of music as wifi is not always available to me. As others have pointed out you can always get a portable charger, of a battery case.
However, I recently went from a 6 to a 6+ (my daughter needed a replacement phone). I am amazed about the battery life of the 6+ over the 6.