You have many one-of Items and Stadiums So I think you should swap Ace Trainer out for Skyla. With N there isn't much reason to play Ace Trainer
Also if you're worried about mirror matches you want to just Shadow Stitch with Greninja no one can use any Water Shurikens while anyone is using that...