How long of a runtime do you need? I built a DIY NIMH that gives me about 1-1.5 hours. It's not voltage regulated so there is some fading. I was thinking of doing a side-by-side time lapse of my DIY battery vs the battery that comes with the magicshine.
let me know if you're interested, I can put something together.
That said, I think you will need to do some soldering, but it'll be pretty simple.