Hey Andy. Make sure the bulb is not replaceable in the old unit. It sounds like mine and turns out the metal end is a snap off socket with the spring fingers all around. Mine are clear so take a small base amber dual filament bulb that is a bit hard to find, but the bulb can be swapped out without even removing the light. Yours might be different but it's worth a look. I was checking how hard it would be to take the lens off when I "broke" mine and discovered they come apart. If they are like mine be careful of the ground wire breaking off. Think it's the black with white tracer, but whichever one is just soldered to the base will not take much flexing.