d2 engine swap

now had enough of td5 spitting water out of the expansion tank overflow,done head,rad,water pump,thermostat,expansion tank and cap.It was spitting water out before I changed all of the above,and doing it since I changed them so the parts have not failed or been fitted wrongly,does it with or without heater matrix connected,it used no water towing a caravan back from mid france to Cheshire,2 days later spit 1 litre out,going to get engine changed by emmotts of colne,Any comments on what to do or feedback on company please.