Hey, everyone suggesting custom lights, OP says he can’t fix his existing go-to-light.
DIY suggestions are out of place, or are you offering to build it for him?