The ideal swap would be a 1.8L "MZ" engine from a '85 or '86 Golf/Jetta, everything would hook right up.
The ultimate swap, imo, would be a 2.0L "3A" engine from a '88 - '92 Audi 80 2.0E. A little bit more complicated, but a lot more power.
__________________
The ringing of the division bell, have stopped... AF User Guidelines