Yes, for maximum capacity (with at least 10A of discharge ability) 21700 beats 20700 by a good margin:
HJK Test/reviews:
Panasonic/Sanyo NCR20700B 4000mAh
48G Vapcell Purple NCR21700 4800mAh
These are apparently the best available for each (in that category), unless someone knows of something better.