I had the same issue, I found out it was the "Always Scanning" setting for location services. I turned it off, and wiped the cache. After I turned the phone on, then the setting on again, WiFi stopped killing my battery. Now, Doze works for me, but screen on time is still pretty bad, worse than...