I found that an NCR18650GA with 10-amp cutoff on the protection board seemed to work quite well for me. I’m using the EagTac one - relatively short at 68 - 69mm. I also use it in my S41 / S41S. I won’t be getting the absolute maximum output possible, but it’s still pretty decent.