Maybe until you have a permanent solution you could flag lineups that only use players from two teams so that they can be manually changed.
No idea how feasible this is or if it's even worth it to implement before you have a permanent solution.
No idea how feasible this is or if it's even worth it to implement before you have a permanent solution.