I'm having the same issues as OP but I did some testing and found much deeper issues. For me, the Keep WiFi on setting seems to make no difference when it is changed. i.e If I ask it to "never" maintain connection when asleep, it will still notify me (with the delay), if I set it to on charge...