I had my 12v Makita drill batteries rebuilt at Batteries Plus as I felt the
same about them as you do your Hitachi. Great little drill and still going
strong.

You'll have to see if there is one in your area.

http://www.batteriesplus.com/