Here's something else to consider. Early six cylinder 201s front end sheet metal is 3 mm longer than four-cylinder models. This was required to make the six fit.
The sheet metal was standardized to the longer version about '90 or '91 for all models.
Bottom line: If you want a six you're better off selling your 16V and buying a 2.6.