More than a month now ... really

I dropped my Galaxy S5 off at Powercare Edenvale on the 9th of June for a simple screen repair and Water damage under Warranty and after almost a month of no feedback, was finally told it would be replaced. Samsung Head Office at least had the decency to communicate with me after I went as far as getting the skekro number and phoning them direct, and to let me know that I would be receiving an S6 as the S5 is no longer in stock. I am however still waiting for any sort of feedback and confirmation of when this will happen. I have always been a loyal supported of the Samsung brand, but am seriously considering moving over to Sony if I am not attended to urgently and my new phone sent to me asap. The lady at the counter said 3-5 working days ... not 3-5 weeks and from the looks of things now .. 3-5 months if this continues.