Couple of problems... Help :)

[Mike581]

Hey guys,
Ok so at the wknd I skirmished my L119a1 build.
First problem was I was shooting round corners, up to say 30 metres was nice and straight but when shooting at guys at around 40m it had a massive curve to it. I was literally firing around trees a fair way from target to try to curl it round!
I'm thinking hop rubber / inner barrel misaligned but I've had a quick look and seems fine?

Next problem...
The gearbox is highly upgraded with systema gears, laylax piston etc etc and the motor is unknown to me, I think a g&g.
A few times I had the gearbox lock up on me, was cleared by removing the motor and refitting and on one occasion by continually trying the trigger until it freed up.
I was using a 9.6 1500 battery.
Is this a motor problem, I have a hi torque I can fit or is it a capacity / discharge problem and would running lipo fix this?

Any help appreciated guys. Cheers