You talk about HDMI 5.1 audio. This doesn't exist, but now I have the idea that you eventually use an HDMI audio extractor with an 5.1 / 2.1 channel switch. Am I correct? A user at this thread currently has trouble with such an extractor.
If yes, then your described sound expansion board could work.