You can use a late beetle M/C, also Kerscher (
www.kerscher.de) sells a M/C for 4 wheel disk brakes.Also late VW buses w/o servo are using quite big M/C.If you decide to go for a bus M/C you might have to drill two new mounting holes in the pan.Toss the 944 M/C.