Landing gear motor moving.

I discovered when retracting the landing gear under load, the entire motor assembly rotates counter-clockwise about 1/8 of the way around. This has resulted in a gouge in the motor casing by a set screw on the rod that goes to the other side. It appears that there is a lug on the piece the motor is mounted to that is suppose to engage the side of the landing gear tube and keep that piece/motor from rotating. However, when under load, there is enough play in that piece to allow the lug to slide past.
I discovered one of the two bolts holding the motor on had some extra metal that wasn't trim off of the head. This resulted in the bolt not seating into the recess, and not fulling engaging the threads. This also slightly bent the bolt. I replaced the bolt, and this helped a little with the motor not swing out of place when not under load. However, it still wants to twist out of position when under load. I have long arms and can hold it in place and activate the retract switch, but would like a more permanent solution. I cannot see where there is anywhere to make an adjustment on the piece with the lugs to keep it snug to the square tube. Am I missing something obvious? I took the motor off, but didn't attempt to disassemble it any further. I looked for something i could zip tie the lug to to keep it in place, but there isn't anything on the inside front wall to secure it to.