I bought my gear linkage bits from:

http://www.ywkparts.co.uk

Has both the gates for the two types of housing, tight as a nun's lady garden now.