Suggestion: Let players have two active adv, but only allowed to fight in one. Once you made an attack either finish adv or cancel to be able to fight at the other adv. Troops movement only legal on the second.
No need to bounce gens at home island. Less waiting (toilet-, coffee-time).