I get Goku, as main character, had to be the strongest. My main wish was just that others got to do more.
For example, in my post earlier, I said it would be better to see a crew of Trunks, Goten, Pan, and Bra, with Mai as token normie. Plus Uub who I forgot.
Since all are weaker than Goku, it would allow for more tension.
Find a reason to keep Goku not involved in the early, pre-Baby stuff.