i was previously running the leaked gingerbread version, after the OTA, i rooted and have had problems with my battery since. on the leaked version i'd get at like 18+ hours with heavy use (calls, texts, facebook & twitter). after the newest version, i can barely get 8 hours with minimal use and my settings are the same. i don't have any live wallpapers, all wifi, bluetooth and gps settings are off. i've recallibrated the battery. i have the battery that came with it. should i unroot and go to verizon? if so, what's the quickest and easiest way to unroot?