Welshy,
Before you try a layshaft, try a RW racing Spur gear. My std Tamiya one was warped and thats what was causing the wobble and also they are really noisy too as you heard on my video. The RW spur is much quieter
AE B4/B44 ones also fit fine.
MK have them.