I decided to leave the 016 trans in place and just pulled out the motor and everything else around it. After a degrease and a wash down there wasn’t really any going back, and as I was a little pressed for time (I was on holiday back to the US and using the workshop at my brother’s house) the goal was to get the motor and related ancillaries in place within the week.
Oh, and who doesn’t like a Yakima roof rack on a Quattro?