Damn, this is actually very challenging with 3. I want to spend all 3 points on Gotenks issues, but damn that Gohan issue needs to be addressed as well.
I personally don't have much issue with Gotenks too much. Base Gotenks implications need to be thrown away. Let's see.
1) I would have to change Base Gotenks Pre's statement and expressions around it. He shouldn't be so strong.
2) Going to have to change Base Gotenks Post statements as well.
3) Kaioshin shouldn't be afraid of Yakkon, Pocus. That whole mini tournament thing should be rearranged. This should be a time to showcase the non Saiyan fighters imo. You could have Krillen fighting, Yamcha, Tien, Piccolo all over again. They could fight all of Badibi's lower villains.