Half our company are still using these, what's the smart thing to do here? I assume actual risk of fire is very minimal, but the advice is to "please stop using it". Losing our machines for a couple weeks would be pretty impactful...
I never went through with buying a new one and returning it, but it's something to look into or ask about!
(After some quick Googling, it looks like it's a 14-day return policy, not 30..)
Who told you to do that? (Are we talking, like, a friend? Or an actual Apple employee?)
The only reason I ask is because I thought that was "return fraud."
Then, when the time comes (soon?) to replace the 2015-2017 MBPs, consider whether you'd rather repeat that with future MBPs or buy something different that has on-site same-day service and user-replaceable batteries and other components.
For example, I just had the battery (+ top case) on my late 2013 15" MBP replaced this week. I brought it to a local service shop for a quick inspection, then took the machine home. Part arrived the next day, brought it back in, and it was all done in a couple of hours.
It's been years since I was involved in this sort of thing, but at one time Apple had separate people to handle business accounts, especially ones with many machines.