I upgraded to Ermine (Froyo) and although Pandora insists on auto-loading, I can still hibernate my PE for six hours and hardly notice any battery level drop.
I'd let the battery drop all the way down, then charge it (while shut off) overnight a few times. Maybe you can reset the battery and get more time out of it?