Big fan of CibiƩ too and they'd get my vote always. Don't know what models exactly I have, but they're the concave units sold as aftermarket items years ago. I have two, and they are 'better' than my other classic lights, even with bulbs in the 36 to 45W tungsten-halogen range. Not all that much worse than the lamp on my only (semi)modern, a 17 yr old Yamaha XJR, at least at the lower speeds on oldies.
Our real problem, I reckon, is the much-reduced reactivity of older eyes. I never struggled with the dark when I was young and immortal, but nowadays, glare, wet, anything really, makes me blind it seems!