I can't be sure yet (because every day's use is different), but I seem to have greatly improved my battery life by switching from "WiFi Power Saving On (Maximum)" to "Wifi Power Saving On (Intermediate)".

This seems counter-intuitive, but there was some talk about a bug related to the Maximum setting which might explain it.

Even so, I'm not up to a full day's battery life yet.

Regards,
Roger