5% drain overnight is not bad and probably further changes may not be worth the hassle in your case. You still would have significant improvement changing WiFi and AOD, but in your case 50% progress would mean 2-3% overnight drain instead of 5%. In my case (Exynos S8+) AOD takes a lot of battery...