DX:16241. If it were me I'd mod the DC-DC board with a DX:26109.
-Foil wrap the module for a snug fit in the host.
-As an added bonus, this is the lightest P60 host I own, so those riders who are weight conscious will be pleased.
-As with any DX purchase, you can expect some of these lights to be DOA out of the box. My 501B needed some extra DIY work in the switch cap to get it to perform reliably.
-You can flood the beam with some scotch tape over the lens.
Avoid a mode switching light that interrupts power to mode cycle. You run the risk of a mode switch from vibration.