MKV works fine, but its a huge hassle to do that for every episode, every week, across like 10 shows at a time. Content is not usually labeled what it is so its a gamble whether you get mp4 or mkv. Which means you need to constantly be monitoring it. So while your suggestion works, its a bandaid.
The real solution is to have mp4 work.
