That's basically a 9P configuration.
2mm is nothing to worry about in a light that size.
The head and/or tailcap spring will easily compress for that combination to fit.
Yeah, the pre-edit length for sure would not fitI caught that before the edit! LOL