I came to the same conclusion when upgrading from 18650s to 21700s, I spent a long time trying to weed out the poorly binned rewards, and the minefield of lithium batteries. They weren't cheap but have been happy with their performance.

There are a lot of people out there that see 18650 or 21700 and think a lithium ion battery is a lithium ion battery and they're all the same (i.e. trying to pull 20 amps from a 2 amp peak battery). I miss one of the father's of liion battery education, Mooch (from ecigarettes forum) who had a whole methodology of testing, and educating people.