I had this same problem on a different light. Replaced the XP-L HD with a XP-L HI. I was doing it for my wifes dad so I don’t have the light in my possession anymore. I do remember having to trim the centering ring little by little until I had the emitter placed at a proper depth in the reflector. It didn’t take much before the beam went from fine to fubar and back. I also remember having to trim the ridge on the top of the centering ring as well. It was causing problems too. I imagine that had something to do with the lack of a dome on the HI emitter. I am not a expert on this at all. I spent many a evenings and going through a many of centering rings before I found the right adjustments. I highly doubt if I could replicate it again.

I just kept sanding the centering ring, testing, more sanding, more testing, etc. Didn’t even put the lens or bezel back on after a while. Once it was looking good I put the lens and bezel back on and called it a keeper. What I didn’t know then that I do know now is that my father in law is damn near blind and wouldn’t have known the difference anyway.