So I turned of location scanning, "always allow scanning", option under advance wi-fi settings, then shut-down the phone for a couple minutes, restarted and stuck it on the charger for a full charge... the phone has been fine since, going on 48 hours. Could just be a coincidence.