ES2 Shift linkage woes.

[Ben Swann]

As I'm trying to wrap up details in order to get the ES2 on the road I am having to
replace some of the high priced parts I bought some time back that have to do with the
shift linkage mechanism.    Perhaps someone familiar with S2, RS2 or 01E conversion in
CQ or UrQ might be able to help, either with parts source or information...

Turns out both shift lever assemblies came apart - The RS2 one and the original Coupe
Quattro one - they appear to be nearly identical and the ball assembly just separated
from the carrier housing.  I have one provisionally repaired for now, but am looking for
a better one - see ad for details:
http://www.audifans.com/marketplace/show.php?table=pm_audifans_Wanted&id=4538

More importantly the RS2 assembly I sourced came apart at the ball joint that connects
the selector shaft to the transmission shift lever.  I had sourced another linkage, but
found it was different.  I'm trying to see if I can make a repair to the one I have
rather than attempt to change it for the completely different mechanism that I don't
think will work on this  01E transmission.

In order to show pictures of what I'm asking I posted them in audifans ad: 
http://www.audifans.com/marketplace/show.php?table=pm_audifans_Wanted&id=4540

So I'm looking for replacement parts or solutions to fix these permanently.  

This is getting to be a very expensive transmission swap.  Yeah - I know,  post on
MotorGeek too.

Ben