I just wanted to mention that I've done a full factory reset of my phone now, and it seems that wifi is using a lot less battery, even with wifi scanning etc. switched on.