Fix your G&P or buy a new one.
Then, if your not confident yourself, take it to a shop for a complete clean up and shim job. Sometimes newer players (myself included) think they know what they are doing when they are assembling mechboxs, but really, miss a bunch of important issues regarding air-seals, shimming, compatibility, lubing .ect
A well shimmed G&P is probably the best AEG on the market, with the possible exception of King Arms
It's better to light a candle, than to curse the darkness