Cree XM-L2 and 26650 battery

Lorum ipsum. Lorum ipsum. Lorum ipsum.

If you’re okay with a 20mm or 22mm driver, you can get a Cu washer that’s 24mm in diameter, and use a step-bit to drill out, say, if it’s in 1mm steps, a 19mm hole and only go partway through with the 20mm step. Then solder the 20mm driver into the hole so that the spring is “up” when you drop it on the shelf.

Search for TA’s 24mm driver.

Lexel has a 24mm TA driver in his list, maybe he's got some left. If your host has a threaded retaining ring, you could probably just pop in a 22mm board and screw it down.