I don't know about Google Wallet bro. Same boat as yourself if I turn in.
My Batt has stablized since I Uninstalled JD...hoping, as you, that I don't have to do a return with all it's hassle.
Remember to Reset Google Wallet BEFORE you reset your phone though! There is some kind of "bad mojo" if you do it otherwise. See this thread - IMPORTANT! Google Wallet and resetting Optimus Elite
Best of luck to you and hope you get it settled.