I had the same problem, VERY frustrating. Try the following:
Settings, Wi-Fi, Disable "Smart Network Switch" It claims to switch (seamlessness) between wi-Fi and mobile networks, however, since I've disabled haven't noticed any change in way it connects. My battery life has increased by half a...