I shortly contemplated getting a new MBPr, but with all the stories circulating about the butterfly keyboards and the touch bar, went with an ifixit battery replacement kit, about 100€.
I'm generally very reluctant to carry out these types of sensitive repairs myself, but opted to do it with help from a friend. If, instead of buying a new one, the customer prefers to keep a 2015 MBPr and is even willing to run the gauntlet of carrying out a difficult repair themselves, something's seriously wrong. And Apple should take notice.
If Apple were to re-release that machine with upgraded CPU, graphics card, memory and storage, I would buy one in an instant.
The 2105 MBP is no prize either. I just got an email this morning that it's covered by the battery recall — I had checked when the recall was initially announced and it wasn't included.
Soldered storage means I can't just pop my drive out and give it to Apple for repair. Glued in batteries mean I can't just pop the battery out with a quarter and swap it out at an Apple store.
So what? Apple wants two weeks to repair the damn thing. Sure I'd like to be able to upgrade stuff, but ease of service is (now) an issue I've to contend with. This may very well be my last Apple notebook.