I contacted Apple support and was subsequently emailed a repair number with an estimated 2-3 week wait (iphone 6) for repair at my selected store.
I received an email 2 days later saying the battery was available and reserved for me for seven days. Went to the store and had it replaced, took one hour.
Result, new lease of life for the 6.