A recent enquiry to Aon from a member was in relation to a Housing NZ project, where HNZ was seeking a statement that “ …. XXXX Architects:
(1) warrants to HNZ that all work will be carried out in a good, professional and workmanlike manner (and in accordance with the provisions of the Contract);
(2) will be required to repair all defects in their works; make good and indemnify HNZ for all direct losses to the works arising from any defect in their works;
(3) will carry out any repair work for which they are liable under the warranty.
(4) if they do not do so within 14 days after receiving notice by HNZ, then HNZ may undertake the work and recover all costs;
(5) indemnifies and holds HNZ harmless for any costs, claims, liabilities etc for which HNZ may become liable arising from failure by the architect.”

This wording was all in relation to a Subcontractor Deed of Warranty sought from the Architect. It is not appropriate to a professional services contract; it is likely to impose terms and conditions beyond those covered by the PI policy.
The short point is: the NZIA or CCCS terms are “neutral” and built up from many years of experience in projects of all types and sizes, so you should be VERY AFRAID of attempts by others to reinvent the wheel, with the prospect of unexpected and potentially unwelcome outcomes.