One thing that bothers me about the choice of the 21M top is that if you expect the whole world population to use bitcoins, then only very few people will be able to own even 1 BTC.
It would be better to right shift the decimal point right now, rather than when/if Bitcoine becomes more mainstream.