if the gearbox comes with nylon bushings, replace them with metal ones. Your current battery sounds find IMHO. replace the crappy systema barrel with either a Prometheus, Madbull or KM. They are solid performers and not that pricy. I personally think that systema barrels suck. what is your mechbox upgraded with? it might need more than you think.
P.S: Fill out your profile