I was thinking it over and come to the conclusion Tenshinhan be axed, Krillin and Yamcha. I M9 as a continuation of the Cell Games, then Trunks eliminates the Androids and Cell on your Timeline, then back to the main Timeline, finally developed further M9. The only difference would be that humans follow the Toei Logica, which has a human (CG) rivaling the Saiyan Base (CG), then step three years and 3 even more increased their powers.