I've had a Surface Pro 4 for about a week now for much the same reason as you - as a practical alternative to my (heavy) Macbook Pro or (bad screen) Macbook Air. Up until yesterday I was pretty much set on taking it back - would reboot after sleep, not wake up with external display attached, lots of display driver reboots, and whatnot. The enormous package of updates delivered yesterday (Apr 19) appears to have solved all of these problems, at least for my use cases. Might actually get adventurous and try the Microsoft/Dell Dock again - previously it would lock up the machine in fascinating and seemingly random ways. If these driver updates fixed most or all of the issues; I'll certainly be keeping it as it's a very nice physical machine with a fantastic screen, great type cover; much nicer to use than anything Apple has came out with lately. Most of the issues appear to be Intel Skylake related; a Dell XPS13 I had for a bit had many of the same problems, as I would expect anything else released with this chipset. You would think that the most likely one to fix these issues in a timely fashion would be the Microsoft Devices - the way Dell had you update things was convoluted and backwards, cira 2000 or earlier; at least the Surface updates the Bios/Firmware with Windows Update.
So if Intel/MS have finally figured out how to write drivers for this chipset, I'd say it's a fantastic machine that should serve you far better than anything Apple currently has on offer. I don't see any signs Apple will innovate whatsoever in the coming years - they are just rehashing quite old and tired designs into slightly different packages. If anyone ever decides to write any software for the UWP platform (Enpass is about the only good example I found from the programs I use) the whole universal platform idea has a lot of promise; there is no way you'd ever see something similar come out of Apple or Android land, they are too large and entrenched. In the meantime the Win32 programs work well enough, if a bit clunky in places.