So after submitting a BBB complaint today I get a call and email from Tmo presidential section executive team. He apologized for all the issues and said I will be getting either the monthly credits or a lump sum credit, he even gave me date deadlines so I will know for sure if the billing is correct. I'm glad it's fixed but sad it's only because of a better business bureau complaint. Oh well, fixed is fixed.