Good luck on the work. I remember using VW parts for repairs (specifically, I remember using a VW clutch plate, identical to what was in there, and I seem to remember(?) that the engine innards could use VW as well. I also recall persistent cooling problems. But it was a fun car to drive.