In the next iteration, next year, it's hard to say what I would choose, because a few big factors could change:
1. So many peripherals go USB-C, or I have enough such dongles, that the MBP's USB-C-only doesn't bother me as much.
2. The Bash shell in Windows is as seamless and well-supported as it is in OSX.
3. Apple adds some unpredictable game-changing feature to its laptop line.
4. Apple finally produces a new external Apple Display.