Well, I would save up for a CA gun of some sort, I have a lot of Echo1 guns and I can say.... They break.
And they do shoot better out of the box. Accuracy and FPS, but that doesn't mean you shouldn't upgrade
some stuff internally.
I would go for new gears, shim job, and a new battery/charger. And a thightbore barrel never hurt anyone.