Sorry to hear that,been there with other cars i have owned,one turned out to be the thermostat not opening properly,bad batch/NOS,at least we didn't have to take the Tranny off to fix,VN. Another car,Datsun,was a cracked head.
If having no joy with the original mechanic i would consider taking...