You can put AOD on a schedule so it automatically disables after a certain time and come back on when you want. Also, utilize DND on a schedule so notifications don't display in the middle of the night. Not sure what the music controls have to do with AOD. You saying you had music controls on the AOD? You also don't have to wake your phone to see the the artist and track because it's right there on the AOD.
Yeah you could activate music controls on AOD but you had to actually swipe to get them which was a bit tedious.