HKJ has a handy 18650 battery comparator here. Once you get a few candidates, you can run your own comparison. Following is an example comparison between the Sony VTC6 and Samsung 30Q:
\
But there may be other factors in comparing batteries like longevity and cost. Also, wrapper color - do you prefer the color pink or green?