25mm is squarely tube-light territory. Nitecore P12GT is a nice but pricy option (a thinner sibling of the MH20GT). I’m working on a review of the Sofirn SP31 V2.0 - a tube light with XP-L HI. It seems to be a great light so far… smaller than the P12GT, much cheaper, and has 90% of the throw of the P12GT (I measured 17,900 vs 20,150 lux).