Something is still wrong with hinge/rotor hitboxes

In order to get subgrids to merge to maingrids, we have to employ hinge + hinge/rotor/piston combinations. I've noticed that with hinge/rotor combos they they do not fit properly inside 1x2 cavities. If you place a hinge and then a rotor (even if the rotor doesn't have a rotor head) and then place 1x1 blocks around it, when the they are surrounded the hinge and rotor begin deforming. The hinge goes off 0 degrees and twists. The rotor/rotor head similarly go out of alignment, often to the point that they will no longer function. If you mess with interia tensors on each component, you can sometimes get them to snap (temporarily) back into correct alignment, but it's clear that they are somehow under pressure to deflect. Placing more blocks on the grid will also cause them to shift back out of alignment.

Looking around in debugdraw, and trying to operate the hinge, it seems the rotor is not sliding past adjacent blocks, and causing enough friction for phantom forces to flip the grid around. If I replace the rotor with a plain old light armor block, it slides in and out of the recess with no issue at all. I guess that means something about the rotor is still outside the confines of the 1x1 space it should be taking up.