a simplefix would be Binding gear to a slot or implementing an option to"save" the gear so it will stay where it is ...

cause its pritty annoying to do lets say Group convoys then switch to your SA team to help out a Groupmate and then go to Sage Battle and have all your gear on the Whrong slots cause you switched out the ninjas ... sometimes the gear even gets swaped with other ninjas when you dont even change them....