So the cooling issue was due to the radiator fan not kicking in when it should. This was due to a relay with a bad connection. Simply bent the pins a bit and now it works fine.
I managed to get 200 km put on the new motor until this happened...
The end of the passenger side front CV shaft sheared off. New one is on order.
While the car is back on jack stands i'll take the opportunity to install my coilovers