Automatic! Why bother? ;) Since you asked, the easiest swap would be an 1.8 GTI motor (code JH). It came in 83 - 84 GTIs and some Scirocco's. 90 hp. Although if you use a dual outlet Dasher manfold it will be closer to 100. While your at it, grab the airflow meter, GTI's had the large (80mm?) ones, some cars (maybe your Audi) have 60mm. Later, Brian