Honestly for me the features that matter are identical across the platforms and iPhones have far superior build quality. If I really wanted to store all my music on a drive I would just plug one into my NEX. iTunes in the cloud lets me get to my library as long as I have Internet which I always have. So as such my drive capacity matters little.
In that same sense with ios 8 my photos and videos will be accessible in the same way from the cloud so I have even less reason to care about my phone capacity.
As far as android vs iPhone.
Android you have to work harder to clean out the bloatware and you have to worry about your personal privacy a lot more than on an iPhone, but it is still true that if you put the work in the phone can still do more than an iPhone can.
So the question you should ask yourself is, are the deficiencies of the android platform outweighed by any perceived advantages? Do you normally jailbreak your iPhone? Do you like to tinker?
If you truly want to customize every aspect of your phone go android. I prefer that my phone is two years old and still works as fast as the day I got it.