Long overdue update. I just noticed this thread in my subscribed list, but just haven't been active, lately. Thanks, everyone.
The W01 stayed OOS everywhere, and the TW02 just didn't look like it would handle things. I ended up noticing and purchasing Overready's tool, that I found thanks to cland72's magic keywords. The problem head took being tightly clamped into a vice, and a few good whacks on the ratchet, to loosen up the ring, ripping off some of the protective coating from the front rim, and bending the head into an oval on the bottom, even though it was on a body (reverted by squeezing the other sides in the vice). Two Danco #35577 perfectly space a Malkoff M61 dropin from the stock lens, bezel ring, and seal ring, without affecting the beam any more than the bezel ring itself, and allowing for excellent heat transfer.
Now, instead of an old G2L/KX4 going unused, I have a bright M61 powered G2L, with no heat issues, that gets about 1.5hrs out of a 17670.