Tbh after reading all this the best thing I would suggest really is to either take the car to a specialist to get rectified, or if your partner is mechanically minded I would get him to take the head back off and get that checked by a specialist, as if you get too many monkeys playing about you could end up with more problems if the head work is poor