That said, if I bought one tomorrow and a new one came out before the "no questions asked" return policy ends, I'd switch them.
I am hoping that I am satisfied with my current one for the next couple of years at least, especially now that we are in the in-between. Sadly, I think that the OLED bar is going to be a deal breaker for me.
As much as I don't want to, I am also considering a Windows laptop. The Gigabyte Aero 14 looks really good due to the long battery life that I've come to expect from the MacBook Pro.
Mine does too, but the lack of hardware updates is disconcerting enough that my next hardware(laptop/desktop) purchase won't be from Apple. I really like OS X/macOS, but the overall attitude seems to be that they just don't care, so I'll look to something that does care a little more.
That's fine, it is their (or their board's?) choice on what to pursue, but I don't have to buy either. Their priorities have shifted away from macOS and the hardware that runs it. If those priorities haven't shifted, they should consider a retreat or some meeting to determine why fans like myself and many others in this thread feel that way. They should ask themselves why it is taking so long between updates to the Mac Pro, etc. They should ask themselves why they have "Pro" in the name but then leave the hardware out of date (especially since its own name kinda implies it is for power users that want powerful machines).
And no, my 2013 MBP still works just fine and probably will for years.