If it's in warranty I use that and don't do much else. I don't pre-diagnose since it's going to get fixed.
My guess is same as yours.
Hey I got a Apple MacBook Pro (late 2016 version) around December of 2016 and a week ago my MacBook display starting shutting off at around 60 degrees (80 if I open it very slowly). My best guess is that its some cable that connects the display to the hardware but I wanted to get the general idea of what exactly is wrong, before I take it in to see if warranty covers it.

Chowhound
Comic Vine
GameFAQs
GameSpot
Giant Bomb
TechRepublic