My other thought is you could go with an aspheric option. I know Led Lenser isn’t always held so highly around here, but something similar to a H14R.2 might be more like what you’re looking for.