maybe you could try the replacement bulb in the back and a better light in the front. For my purposes, I don't worry too much about the headlight on my commuter. I have a BuM lyt on my commuter, and it works fine for me, it was replaced by the Avy, which can be purchased from Peter White and others:
B&M Lumotec Avy N Plus, Part # B&M162RNDi-04, Price: $ 42.00

Or if you wanted, the Spanninga Pixeo tail light is less than $20