[meatgel]

I remember when I first got my Diamond that a few people had worse battery life than others and the advice was to take it to the store and get a new battery -- which worked. Since there are no TP2s at the store, maybe try calling tech support to see if they will send you one ... worth a shot. Or you could wait until the stores are carrying the phone.