I am now the owner of Lightdude's Novatac 120p. This one is going to get the XM-L treatment.
Oh, and I noticed that with the Hogokansatsukan brass trick for the 17670 body, this will also allow the cr123 body to use one unprotected 18350. It almost works with the factory spring. It might work if one chopped the factory spring on one end, if I could buy another spring I would experiment.