Information presented all true (except for the image which makes it look like an 18650 is larger than a 21700).
But regarding the question of a battle I'm not sure some of the disadvantages of 18650 are really an issue in real life.
One's use is also a large factor. We do not need to recharge our 18650's much because they are not used brightly a lot at night.