Instead of the item being added to the MainHand slot shields should be added to the offhand slot for vanilla parity.

maybe we could do this by mixing into the armor stand class?

Yeah that might be the best way to do this. I think there is some kind of method for items where you can define what slot it goes into?

There is a method in living entity where it grabs the preferred slot for a given item type