I had a 1984 944, I fitted a 1991 3000cc S2 engine and it went very well!!
I had it for about 3 yrs in Lanzarote.
My Covin will be for sale soon, It is a LHD with a 2110cc tuned beetle engine.
I am finishing preparing the bodywork then I will put on primer.
The car will need the windows fitting with new seals,(which I dont have)
and interior trimming and carpets.
The engine runs "Megasquirt" fuel injection with a Ford EDIS ignition system.
I will post some more progress pictures on my build thread" Blue Covin living in Marbella"
Let me know if you are interested?
Here is the 944.