AEG Build Help

So I have a g&g cm16 raider (short barrel) not the 2.0 version either. So i recently just shimmed it, on top of that, I currently made some changes, I had this gun for several years and its only now that im back into airsoft. So now I want to dive into upgrades. This is what I purchased. Its shooting now average 350 to 360 fps.

Also I don't have a chrono but I do have Acetek bifrost BT suppressor that has a chrono built into it.

Current upgrades from stock

-6.03 mm madbull inner barrel

-JBU high torque motor

New Upgrades

- EMG x Maxx Model CNC Aluminum Hopup Chamber

-EMG x Prometheus Air Seal Chamber Hop-Up Bucking and nub 60 Degrees

-GATE ASTER II Bluetooth Airsoft Programmable MOSFET Module w/ Adjustable Quantum Trigger

-Maxx Model CNC Aluminum Double O-Ring AEG Cylinder Head

Now Im not looking for speed or anything I that field. What I am looking for is consistency and accuracy. Ive already shimmed the gearbox and believe its decent, but I feel im lacking somewhere. Im reaching out for assistance and recommendations to what I should have also installed since I was already in the gearbox.

Also if you can recommend a motor grip, the one I have now appears to give my issues with the motor's seating, its not the original grip its from a previous gun I had since the original had broke. As I mentioned, im not looking for speed but for reference this gun is my go to which I can use indoors and outdoors. Now I'm limited to 380fps for my indoor field so if I could also stay within that range, that will be great.

Thanks in advance folks.