Upgrade S2+ or make a new one?

Hello, I'm happy user of custom made Convoy S2+ with 30° soft collimator, multi coating lens, early Nichia 219B 4500K 92+ CRI and custom made 3A driver with stabilization and stuff. I'm thinking about slightly more light (efficiency) and elliptical lens for bike riding. I'm wonder if triple driver is nesesery for that kind of light signature.

Thank You for help.