Is there a bike light that keeps the light angled down?

LED Flashlights – General Info
10

I was also going to suggest the elliptical TIR optics. See a couple beamshots here.

The optics linked to in the post above and in the link I posted will fit a convoy S2+.