I don't get the problem with ANALOG.
That is the headphone socket of RPi which uses a filtered PWM signal as a cheap DAC.
It's always been refererred to an the analogue output of RPi.

Would you prefer AUDIO_ANALOG_AND_HDMI as the option?

The settings part is a small part of this PR, and I'm happy to fix it up when new audio settings go in.