Note 7 Mandatory Recall and BOGO Free Phone Promo Credit not honored Issue

I purchased the Note 7 and took advantage of the BOGO free phone offer and got a second line and another Note 7.  Unfortunately everyone knows that the Note 7's had a MANDATORY recall and we had to turn them back into the store.  I turned them back into ATT and followed their exact instruction and got the edge 7 as replacements for the two phones.  Fast forward to 11 YES ELEVEN MONTHS later and I am still fighting with ATT customer service each and every month because they are charging me for the BOGO phone.  I used to work for a telephone company and for the life of me I can not imagine how and why I continue to have to call each month and still do not have a resolution to this issue.  I am about ready to put in a grievance case and have them buy out my contract and my time for the hassle they have caused so far.  

Has anyone had this same issue?  If so, how did you get it resolved?  I have had ATT for 20+ years and didn't want to change carriers but it looks like that is my only option.  But that means when I change wireless carriers I will cut ties with them completely and pull my Uverse and Direct TV service as well.  

#Frustratedbeyondwordsatthispoint  #readyforthisnightmaretoend  #reallyATT