Yes, both of them!
Henry Ford eventually learned that he had to have other colors besides black. If Apple wants to give people only 1 choice, they'll go to someone else. That is why the GSIII is #1 and 70% of the world uses android smartphones. That said, I think they've always chosen to be a niche player, I've yet to see anything from them that makes it look like they are really trying to please more than their core group - they just want to try to put more people into that group.
Free market comes into play here. If you look at the GN2 vs. DNA threads, see how many people won't get the DNA because it has no swappable battery or SD card. While that may not be enough to convince HTC to add yhose features, I am sure it's enough to convince another manufacturer to make sure they don't drop them.