Default WiFi reconnect troubles(802.1x PEAP and WPA2) and delayed WhatsApp messages on CM11

Hi all,
I have two annoying problems with my OneS using Cm11.

First problem is that my WiFi has reconnect problems.
I have two WiFi networks I often connect to. One at home (WPA2) and the one at my University (802.1x PEAP).
The problem is as follows:
When I get home from University and had my phone connected to the Universitys WiFi the phone doesn't reconnect to my home network.
Trying to reconnect "manually" via WiFi menu doesn't work either. The network(s) is/are listed, when I try to connect the text shortly(not even a second, more like a flash) changes from "saved..." to "connecting...". Deleting and readding the network is not helping either. Couldn't connect to the WiFI at my parents yesterday either (also WPA2).
Only way to solve this is to reboot the phone.
Vice versa the problem doesn't exist. When I get to University the phone automatically connects to the WiFi.

Radio is 1.11.50.05.28_10.27.50.08L. Is that the correct Radio being from Germany using T-Mobile network?

Second problem is that WhatsApp messages are delayed while I am connect via WiFi. On 3G the messages arrive instantly.
WiFi is always on.WiFi optimisation is off.
I've read that delayed WA messages are pretty common, but the majority has the problem both with WiFi and 3G.

Few days ago I wiped System, data, android_secure and the caches and installed the latest nightly and latest pa-gapps to see if that helps. But it didn't.


Hope someone can help.
Thanks