do you have a battery now? I only ask because I've had the original magicshine for a long time, upgraded the battery at some point, then last fall got a new light head for the battery. I went with the
Magicshine® MJ-906 Light Head –Round Plug
the original didn't have any beam cut off so I had to make my own hood for riding in traffic. this one has a square beam pattern. the flash mode is modest so I don't think it would be too bothersome for drivers, etc. I haven't used it in traffic yet, just in the woods at night

a photo while riding ...