The true solution about the CGR 18650A , are to be replaced by the industry ,
with something more safer , like an enlarged Sanyo NiMh ,
the new ones that they hold their charge for long time.
EDIT
Lance , because of my experiences from my own adventure ( wasted hours about getting info and parts & labor),
I have to discourage you up to the point to let it go , its best of getting even an Chinese medium quality battery,
than wasting human energy about rebuilding this pack.
Mostly because the rebuild , it has less than 5% success rate.