Comparing apples to apples, a Panasonic 18650 cell is about 3500mah, and the equivalent 21700 cell is 4200mah.
Personally, although overall performance to weight and size might be better, not interested in adopting a new battery format for only 20% more capacity.
I am always excited for new Zebralight products, and hope they continue to make the most compact and well designed lights, but if capacity increase is what they are after, would much prefer jumping to a 26650 format where mAh increase is closer to double (70% actually).
On the topic of lumens, I hope Zebralight takes a step back from unsustainable turbo levels and designs the light around useful outputs that can be sustained over extended periods of time. My H600fc mk4 on the highest setting overheats and steps down way too quickly to be of any real use in a backcountry situation. If I want a show off light, I'll buy an Emisar D4 and call it a day.
The Cree vs Nichias battle is a tough one. I have become a tint snob over the years and now even a Nichias 219c looks too yellow for me next to an e21a. My H53c is starting to look more and more unbearable as it makes the 219c look amazing by comparison. With the lumen war aside, I think Zebralight needs to select the right emiter for the light, and hopefully that means possibly considering other LED manufacturers especially for their high CRI offering.