While details are still a bit sketchy, I think replacing batteries for anyone that asks is the right way to handle this whole situation.
This morning, French tech blog iGeneration reported that an internal Apple Store memo has been circulated which states that if a customer asks for a battery replacement on an iPhone 6 or later, then the Genius Bar should allow it, even if their phone passes Apple's own diagnostic test.