I heard good things about mugen batteries. They should be able to make a 1500mAh one that fits in the original case of the N900. Give them some time or send them an email to express interest.