More fighting for them to honor their promises????

I am showing one star, but it is by far to much for the service that I have received from Vodacom the last few months. Firstly I had to fight for 2 weeks solid to receive a handset that was upgraded more than 4 weeks prior to that. Now that I receive my 1st new data and airtime, I have more problems. When I upgraded I was given a promotional 5g per month for the 24 months of my contract. When I had a problem with the handset, that was suddenly not available anymore, I had to settle for a new handset, as well as a new contract (obviously more expansive) i explicitly asked if I will still be getting the promotional 5g over the 24 months period of my new contract, and was assured that I will. Wellll..... I have not received it... Surprise... do I now have to fight for another solid 2 weeks for them to honor their promise?????