Issue 1 can be easily solved by using the Audio menu in RetroPie and choosing your default output (Analog Jack/HDMI).
For #2 - The Headphone value can also be chosen in the EmulationStation settings, since it has been updated in June 2020 following the RPI OS changes.