It's a lost cause. We've given up and won't be buying any more. Over 50% of the fleet we bought has issues and being replaced (not just for display issues, battery, keyboard connector, boot loops, RGB lines on screen), and the replacements have had other issues. They obviously know it's a bad device which is why the Pro 7+ was released. I'd love to hear whether 7+ is any better, but, won't be buying any.
Good question, does anyone have a SP7+ and 1st gen brick-style Surface Dock to test?