Hi Paul,
Long time no see (or post).
I hope that you're not really still in Buffalo but rather down in Florida staying dry and warm.
A 20-cell NiCd/NiMH pack can be replaced with a 6s Lithium pack. A 10-cell NiCd/NiMH pack with a 3s Lithium pack and so on.
Regards.