This is good advice.
I’ve seen a DIY surgical lamp used in a vet practice using a cheap Chinese headlamp mount and a modified 18350 convoy S2. Dummy cell used with contacts wired through the tail clicky to an external battery pack. I don’t have any further details but it looked like a tidy build.