I just made a Mod out of a RS battery box with 3 AA battery and it work's GREAT.
Now I am working on a PVC Mod using 2 x CR123 battery.
Pic's to come.
I have been looking everywhere on sourcing battery springs, the only place I came up with required a minimal order of 50$. And I don't need that many. Also your idea of a 2-in-1 mod is genius!
I will share the inner working's and give some away as well when I got it like I want.