I think the keyboard's starting to grow on me a bit. The difference between the MBP's and the MB's is still difficult to ascertain though unless you have both next to each other. My local Apple Store also still doesn't have the Touch Bar models on display, so I'm not sure if I'll be a fan of that feature (especially since I do software development).
I'm wondering if the best move at this point would be to max out a 2015 model and delay the switch to PC/use the new MBP decision for a minimum of 3-4 more years.