Have you looked at the Solarforce Gladiator? It’s a 4 x 18650 P60, and should be plenty long. IIRC it will take any of Solarforce’s P60 heads.