Since getting the heli flightworthy i've had a few minor scrapes of the blades.
I bought some main shafts from Trademe but they weren't straight so decided to send them back and get a spare belt instead.
I went to Hobby Hangar and bought myself some new Align mainshafts that are considerably better made, and straight! I also picked up a few main gears as I noticed that mine had a few teeth that were a bit broken.
The heli is now considerably quieter and wobble free.