MakeMKV can rip the entire disc and you can have handbrake add audio as you see fit.
Although I think it can already rip all the audio tracks attached to the main movie. I remember transcoding The Fighter with just the commentary track by mistake.
But if you're solution is working, that's great. I'm just pretty sure MakeMKV/Handbrake can do this thing you're saying it can't.