If you're ambitious, the Modis battery can be cut open and repacked. The cells are NiMH - not LiIon. The cells are available here:

[...] [[...]]

OR

[...] [[...]]

Look for HR-4/3AU cells. I bought mine from Battery Station.

I can't remember how many it... Login to read more.