I almost jumped ship recently because the Surface Book hits a great mix of screen quality/power/battery life, but judging by the forums, it's buggy as hell. So what to do? I'd love a swap-able battery in my rMBP like I have in my T450s, but at the end of the day, I never reach for my ThinkPad when I've got my Mac handy. I'll just go ahead and pay the $200 bucks Apple charges to replace the sealed battery.
[1] My non-technical wife, who has a Mac, recently needed to use my work laptop. Her first reaction on seeing the screen was "wow, your firm cheaped out, huh?" I've got a totally maxed out ThinkPad T450s with i7, 20GB of RAM, and FHD IPS display.