Thanks for the feedback from everyone. If I had to do it all again, I would have opted for some of the suggestions I have seen here first, like a proper bleed of the coolant after the heater tap replacement, or getting a donor car or engine from Ebay.
Our mechanic seems to be doing his honest...