Disagree. It should've ended at Cell. Goku died, and refused to be revived. Gohan developed a lot throughout the series, starting off as a scared toddler, and later becoming a fighter who surpassed his father. Goku passed the torch to his son. But according to Toriyama, Gohan just wasn't fit to be the main hero. Keep in mind that Toriyama's ideal protagonist is literally a brain-damaged man-child.