21700 at the mo as v. good 18650 's are hard to get.
Molicell p42a for great current also not bad at 4200mah .
For 18650 the p28a is the top cell in the 2700/3000mah range.
End of the day depends on what you need out of the battery current or mah , remember you can't have both at the same time.