This is now my go-to replacement LED headlight.
800 lumens @ 10 watts
Vision X Solstice Solo 2x2 10watt LED Euro Beam Off Road Light
A bit spendy at $119, but it comes with its own driver that accepts anything between 9 and 50 volts, is waterproof, and comes in three output options (spot, euro, and flood).