After 4 years, my N900 battery becomes less reliable... power drops fastly when under 30%. How should I diagnose it to know if its life time is close to deadline ?

So I am looking for a battery+standalone charger pack. I am located in Europe/Switzerland.
What vendor / model would you recommend me ?

Thank you in advance for your advices
Yves