Performance Bicycles at Overlake have given me an Upgrade instead. I took the defective Head-Lamp to thier shop, they gave me a $10 upgrade to a Cat-Eye head and tail lamp for free.
I chose not buy the same Head/Tail Lamp from GI-Joes since it used a combination of LR-03 (AAA) & LR-06 (AA) Batteries. I wanted something that used just AA.