This is my fear. I'm holding onto my 2015 MBP really hoping Apple starts making laptops I want again, but I don't know where else to go. My last Windows machine was a very expensive Samsung Ultrabook machine that cost much more than the equivalent Apple machine. It was a mess in terms of OS and hardware. So I feel like I'm running out of options.
You're in good company in my household. We have four MBPs (2015, 2012, 2x2011). Not getting rid of them until, as you said, Apple starts making laptops I want again.