I did the same, for the same reason. It’s a joy to use and every time I read one of the (so many) articles on the MB butterfly keyboard, I am reminded that I made the right choice. The 2015 MBP really is the best Mac laptop - which if you want a Mac rather than a Linux box, the best laptop ever - https://marco.org/2017/11/14/best-laptop-ever
I also chose this route last June. My coworkers upgraded to the new rendition later and I've since listened to them complain about the keyboard and mess around with adapters in literally every meeting room. The hdmi port is incredibly useful, I've never had issues in any meeting room and it's inclusion means I never have to carry adapters around. Not so with my colleagues, they need one even just to share files with a thumb drive.
I hope someone at Apple comes to their senses and makes the next big refresh of the Pro turn it into a Pro computer again.
