I think you might want to make sure your B&D Firestorm isn't part of a recall campaign before anything. B&D did have a short recall campaign on some of their earlier Firestorms.
My final suggestion would be if you are a contractor, move up to the 18v. If you are a homeowner, and still can't find the batteries or a new charger, punt and buy a new one, too.
© 2017 Renovate Your World LLC