Replacement indicators for ARB front bars

[TJ]

Hi fellow Jeepers, has anybody figured out a replacement indicator bulb and pig tail which is better in function (or even perhaps an LED)? Mine are corroding fairly regularly and stop working. ARB sells a part number 3500080 that is a replacement unit. But I was thinking the design can be improved.

If not, has anybody fitted a fog/driving light in the same space instead? Just thinking (which can be dangerous or expensive, or both when you drive a Jeep).