Under the NHBC warranty, any defect reported within the first tow years, but not rectified, the housebuilder still remains responsible for sorting it out.
I really think, given the number of attempts to fix the leak that you should name the housebuilder and also I have doubts whether they have the ability or desire to effect a permanent solution.