As the Pi automatically chooses HDMI audio with ALSA, I can only assume you are using the Generic build? In that case you need a /storage/.config/asound.conf. I've provided an asound.conf.sample (also in /storage/.config) for you that you can use as a template.
Awesome, I will give this a try later. BRILLIANT work by the way.