I just switched from a Lenovo to a Macbook Pro before the new ones came out (work is paying). Would not have done so if I had seen the lack of a decent replacement path in the future. Plus Sierra is unstable - it has hard-crashed 3 times in 2 weeks.
Disappointed - I had a couple of Macs back when OS X came out and was very happy. Apple's quality control and attention to detail is broken.