Bubba,
I would check with a store like Battery Plus. I would look for Nickel Metal Hydride batteries. At least these wont catch fire. Lithium batteries use flammable electrolyte so as you suggest they can be tricky. Just google Tesla fire ....
Dan
Batteries are my day job.... trying...