I had the same WiFi connecting and disconnecting in addition to battery draining after 4 or 5 hours. I let the battery drain all the way down and recharged the phone to 100%. It has been about a week but this seems to have fixed both of the problems.
Update: I had the WiFi running only at...