Installation fails plumbing certificate - Sea Point Plumbing

When our geyser burst we phoned Sea Point plumbing to replace it. They replaced it with a bigger version of the old geyser without letting us know that it would not fit into our cupboard space we had had for it. They told us that they had no choice but to use the bigger version of geyser as our old geyser size is no longer made. At that point we were frustrated but accepted the fact that we had to redo our cupboards which would be costly and cumbersome in a small, awkward space. The replacement of the geyser cost R13,800. I redid the cupbaords myself because I just couldn't afford any extra costs over and above the expensive replacement of the geyser. It took me three days to redo the cupboards. We are now, two months later trying to sell our apartment but we've just been told that the geyser which has been installed by Sea Point Plumbing doesn't meet the minimum requirements in order to get a plumbing certificate which is essential in order to transfer our property in Sea Point. We need to move in three weeks' time and having to have the cupboards and geyser redone before we can get the plumbing certificate is extremely stressful because of Sea Point Plumbing' mistakes.