Definately NOT replace the old NiCad batteries with Li-Ion one's. The charging circuitry is not designed for this.

You can recell the battery pack with AA Nimh cells youself or one can easily buy a replacement battery pack on Ebay as well.