Have you checked your wire placements in the grip?
There is a special position that the wires in the grip must go, or they will be too close with the motor, and cause it to actually stop working. This is actually very commonplace in the m16 series, especially if you havent had as much exeperience with dissasembling them. This is how to check it;
Make sure that both wires run on one side of the motor, which is usually the side towards the stock, and are not crossing eachother. Once you have the wires conected, push down on the back of the motor as if you were shoving it into the gearbox. The motor should easily be able to be pushed all the way down, and spring back up again without any binding. The way that the grip is designed is for the wires to barely have enough room between it and the motor. And the grip cap puts diagonal pressure on the motor for it to be aligned correctly, so if the wires are in the wrong place, its just going to tighten down on the wires, and have no room in the grip to move.
Ive had this unexpectedly happen to me at least three times. Usually the motor will work for a few shots, then it will sound like the battery is totally dead, because the wires are preventing the motor from turning.