There are tons of battery reviews here on BLF.
Since you’re already familiar with Manafront.
Review here: Review: MarsFire Sanyo 2600 - 18650
Many of us use these. They are unprotected, so due caution is advised…
You can buy a number of good quality cells on eBay as well.
More expensive than buying from overseas, but you don’t have to wait…
You made a great choice in a light. A good light deserves a good battery…