Hi, I had and have b158, b158b XM-L2 U4 versions and XP-L HI V3, also B58U XM-L2 U2 and XP-L HI V3 and B88 XM-L2 U4.

First of all you have some things that you must to do that will upgrade your lights since they have certain defects.

b158 is a legendary host for the price and really hard to win in that price range, even in the higher.

1. Floating driver ( it was written about it on this forum ), that causes flickering on the light.
2. Better springs ! I have multiple b158 lights that have same problem, after some time of use springs ( especially this one on the drivers side ), become too weak to hold battery in contacts. After some shots and recoils with rifle light start to behave in two ways, first is after shot it change mode to next, and second is after shot it get in LVP regime and start to behave like battery is empty, all back in normal when you turn off and turn on lamp again. If you put better quality and stronger spring then this would not happen.

b158 is winning host but you obviously can not understand that, it is simple just make larger version of b158 with some improvements and it is easy money for Brinyte companu. For example b158 with head diameter of 60mm - 70mm, 2x 18650 offered with some different LED’s in it like XHP 35 HI, XHP 70 etc and it will be a new killer hunting light for the price.