I'm using an aftermarket lamp, with OEM lens up front driver. The original wire was kind fried looking, throughout, so, I took it back to the thermal insulator under the bulb. Simply making a drop of solder kinda round on a wire, then upsetting it with a hammer, so that it can't fall thru the hole. I employed some shrink tube for insulation. I'm probably going to need pictures to describe it... Maybe that old Aussie rear license tag lamp set of mine needs updated wire...?I haven’t decided yet…did you go the fix route? How’d that go?