Exhaust manifold interchange ? (non-turbo)

[Dave C.]

Does the two-piece exhaust manifold from the 89 and newer Audi 100 w/ NF
engine interchange with the earlier NF engine with single piece manifold?

While the intake manifold is off of my 87 5KS for injector replacement, I
notice at least three exhaust manifold studs are broken.  Also, the two
support brackets which tie the exhaust and intake manifolds together have
rotted away.  I suppose the exhaust hanger at which ties the cat to the AT
is also in poor shape.  So I'm thinking I'll need to do something before
too long to reattach the exhaust manifold.  No doubt the later two-piece
manifold is a better design.  Any advice or BTDT would be appreciated.  

And while we're at it ...  does anyone have a two-piece maniflod off of a
late '89 or newer NF engine they would consider selling?  
----------------
Dave C.