My Fenix PD32 crapped out on me after 2 years and I'm thinking about replacing it with a PD35TAC or PD35 V2. I got a few EFEST 2500mah 18650's and a few Fenix ARB L18 in 3400 and 3500 mah. I have heard less than great reviews for the Fenix batteries. The Efest are flat tops and they work fine with my PD32 but i read the battery tube is longer in the PD35, will they still work? If no, do yall have goods recommendations for the PD35? I'm not so concerned with getting the absolute max out of the light but more with how long the battery lasts per charge and how many times it canbe recharged. Thanks.