That 6A motor is the so called bubble block, the 2E motor is based on the tall block which doesnt have the bubbles,
The 2E motor was fitted as standard to the 1992 on Passat Syncro, so it should bolt straight up without any grinder work, unfortunately I cant test this here as before I had it bored out my 2 litre motor block started life as a 1800 G60.
BTW, Both Diamond Hell & Holmes are using 2E motors in their conversions [
]