I would just get a Roku or a Shield TV. I have a 2015 Samsung and whatever stops supporting it I'll just watch on my Roku. Smart TV apps tend to suck in comparison to a dedicated box and what it can run.
I'm waiting for HDMI 2.1 before upgrading the TV. Which Roku device you got?