Disappointed I have to turn off AOD to get my ultra battery life back - eviltoast

Any one else getting super frustrated with the update not actually helping battery life? I unpaired, reset, removed weather, removed all other apps, nothing seems to help me get back to two days. I finally decided to turn off the AOD and now it feels like an ultra.

Is there a way to bring turning AOD on and off into a complication to try and find some middle ground?