I am sure there will be. Maybe one of the increased party size ones will take care of that. However I am sure that without mods the ones not taken will come back later on and we probably will have to fight them.
Personally this is what I find the most distasteful about the locked party issue. Bad enough that we get party-locked and lose out on any companions not in the active party, those companions then return as our enemies? Some people may see this as making sense. I flat-out don't.
