Your battery problems are probably from flash. I have had the opposite experience. My battery life has went from 6 hours to 7. Also with all the major improvements that came with FroYo, my call quality along with 3G reception have improved drastically. FroYo rules.