Hacker News has been whinging about this Apple dilemma for years. I'm sorry to say that I just don't think there will ever be the golden age of MacBooks again. The "Pro" ideas coming from Cupertino are gimmicky at best for developers, and we will be stuck working on various Linux machines and leave the MBP problems to designers. The hacker-type software engineer is not Apple's target market for the MBP, and I think even before it was likely coincidence.
If you look at the pro target even in this post, the majority of Mac "pro" use cases being displayed here are creative in nature. Devs generally aren't spending their days editing video or sitting in Maya and they are targeting those markets - people who need power but don't wrench into their OS internals or open a debugger when something goes wrong. Those customers are also a lot less flighty as long as their creative tools work.
As for me, I stopped complaining and wishing for a pony, accepted that the MacBook is dead, and moved to a ThinkPad for daily use. My 2015 MBP will stick around when I need macOS, but it's best to start converting my workflow to a different platform where I see a future for development work.