I used the edge to read for 6 hours yesterday at work and on a short road trip with probably an hour or 2 so of wifi surfing on wikipedia mixed into that and I still had over 60% of my battery left. I disabled BT on mine since I never use it and I use the power control widget to quickly turn the wifi on and off for when I need it and I keep the screen relatively dim, but bright enough for me.

I've drained it to about 50% after about 3 hours of heavy wifi use on the android side, downloading and installing apps and listening to pandora.

\I've been quite happy with my battery times Hope you figure your problem out.