have pets swap with neutrals
Right now pets will attack anything in its way except friendlies/companions. Have them swap instead, like monsters do in crowds?
EDIT: And definitely have them swap with friendlies. Right now they just wait for it to move.