FWIW, I have successfully sanded down some NX05 optics to fit a smaller head. This was with 1W LS's. I have not noticed any detrimental beam degradation at all.
I'm tempted to do the same with a 30 MM optic, but I haven't, yet.
I hope that, if the Fraen dimensions are not TOO drastic, they might still be able to be turned down and used in a McLux. I have no actual experience with the Fraen, but I remain optimistic, based mostly on Slick's reports.
Slick, please keep us updated and thanks for your input.