You can find the cells on the internet pre-soldered and shrink-wrapped. You just have to disassemble the pack, slide in the new batteries, and solder the wires. Also people sell the shrink wrapped packs on ebay.
Rollie made a battery adapter that that took an arbitrary DC 10-18V supply. They are difficult to find and not cheap ~$300. I found one and its handy.