Not sure if you are still having issues with battery life, but if so try this out...
Under Settings -> Wifi, look for the Options (or whatever the 3-dot symbol stands for) in the upper right hand corner and go in to Advanced. There's a box that says Best Wi-Fi Performance, if it's checked then...