I believe the Tamiya Gear Box kit you mention includes the 'blue' gears that some use to replace either one or both of the rotation/elevation clutch gears.
They will work, however I think those kits cost $12-$14?
You can glue your clutch gears as ausf recommends for free.