KenBar,
You will triumph!!
Worse case, your machinist can bore the bottom flat. He can then drill and tap through the rear bulkhead and insert a short 1/4'x20 set screw. You can screw this in until it contacts the battery as needed. You could epoxy behind the set screw to fill in the cavity and make the light waterproof. You could also have the machinist put in a knobbed set screw and this would become your switch...........
You have a first class LED, driver and flashlight body. You are very close! You could always use a SF E1 to host the LS.....................
Don't return the Head; sounds like you got a keeper! If you want, I can get my Arc clickie 123 tail piece back and send it to you until a better solution arises.
- Don