I have developed a habit of switching the WLAN on and mobile internet OFF as soon as I leave an area with known wifi network and I managed to avoid most of the problems practicing this habit. I do agree it is annoying, though.