The 2016 MBP is absolutely amazing. Just give it a shot. You won't regret it! Just takes a little getting used since there are many new design changes.
I'm in the same boat, though; just wanted an 11" Air with Retina display, and I'd be happy. The 12" is not that at all, so I finally jumped ship to the 13" Pro. Not as happy as the air in terms of portability, but it's a solid laptop (non-TB).
That said, coupled with the LG ultradef monitor, which is also a USB-c hub, I find the MacBook to be just fine for software development.