Replaced the P-gasket, it had more or less disintegrated. Also checked the waterpump and it looked ok, did only have a new gasket for the pump so replaced it. Put everything together and ofc the waterpump started leaking from the weep hole. The good thing is that I now know how to get everything...