Maybe you could file the charger PCB to make it shorter by a couple mm?
You really need a DD08CRMB sized charging board with remote socket for these types of builds or scavenge one from a 10180 light, nitecore tube or build your own etc.
Were you keeping the flint pillar for something?
Frees up a lot more room with that removed.
Bugger. 
Oh-no.
Yes, those DD08——’s are quite small. I have some but have never used them.
I forgot about them … I did locate them today and filed them away in the organized section of my parts now. 
lumenzilla, , Don’t be discouraged, that is a great idea and many here are like it. 
Hope you can find a way to get it all to fit. 
I’m terribly sorry, I didn’t make it.
I will still finish this project anyhow, sooner or later.
Confession:
The last two days, I decided to work on another modding project with intention to replace this entry.
After reading the rule, I found that participant can only have one entry. CMIIW.
One entry, but you can change it if you like.
Just make sure your edits are finished before the deadline.