Kennedy Engineering makes adaptors to put just about any engine into a VW, including inline 4 watercooled motors. I have personally seen a bay bus with a TDI engine in it, the owner was very happy.