After some machination, the headlamp pods are back on. They're not 100% but so much better than the originals. A good coat of termalene grease on the mounting threads will hopefully keep their adjustment threads clean.