I was in the same situation as you and, like others in this thread, earlier this year I finally gave up and went with the shield pro.

HDR and surround sound was suddenly creating so many issues. Live TV had become so much more of a pain since the death of WMC

I still have my PC hooked up to the TV for gaming and some media management but the shield just works. I even moved my Plex server to it.

HDR, Dolby Vision, Atmos, DTS....everything just works without issue. I don't sweat that there is going to be some stupid issue preventing me from enjoying movie night now. I think it was worth every penny when I think of the time I HAVEN'T had to waste dicking around with Windows for the past 6 months