@Castellen:
Is there a specific diode you would recommend. If so, what is its type-number?

I was under the impression that NiMH batteries as you say leaks with age, but that their leakage isn't especially corrosive - ie it doesn't destroy your motherboard. Is this wrong?
/Patrik