We were suspose to do it after the first trial, but tbh after the second trial is the battle against Klara/Avery and then its the make friends with Kubfu mission so it probably makes most sense now to end after the Klara/Avery battle and whoever gets Kubfu can make friends with them over the next 3 badges then return for the tower challenge.