mochi[/member]
It's hard to say the anime isn't canon as he has direct involvement with the show and is designing the overall story arcs while leaving most of the smaller details and animation to the studio. If anything the Manga in this instance is not or at least not fully canon as Toriyama handed the reigns on that to the Mangaka that made the Dragonball AF fan manga and told him to "go wild" with it in an interview, which is why it has major discrepancies with the anime as it is more loosely based adaptation.
Toriyama interestingly enough gave an interview in 1997 and then repeated almost the exact same thing in a 2013 interview about how he never intended on Goku being seen as altruistic, but rather always wanted him to be a character that was battle hungry and as a result just happened to produce good-willed results (most of the time). It actually sounds like he wanted to make Goku an anti-hero but failed at doing so at least to the idea of what an Anti-Hero actually is. Possibly it could be said that Goku has just been lucky that he could mesh up his over all agenda with that of producing a good guy result, and perhaps we will see more of his true nature in later arcs of Dragon Ball Super.
Toriyama in 1997, on the nature of Goku's character and personality as he intended it:
Original Interview Source: http://www.kanzenshuu.com/translations/wired-japan-1997-akira-toriyama-interview/
Toriyama again in 2013 (right before Battle of Gods) on the nature of Goku:
Original Interview Source: http://www.kanzenshuu.com/translations/akira-toriyama-masako-nozawa-special-talk/
In light of this, it could be said that if anything certain elements of Super are actually closer to the original way Toriyama intended for his story and characters to come across. It's also worth noting, that during many of these interviews that I've read things that people attribute to Toriyama being absent minded about things is not necessarily accurate in all cases, as he repeatedly says things like "I wasn't really concerned with the hair color of X character when I redrew them", ect... He has said repeatedly that he is not very concerned about specifics of minute details but rather the main intention and design of the over-all story. And he apparently has no qualms about retconning minor things, such as the Pilaf-gang actually being kids in Super rather than shrunken adults because he thought it would be fun basically and work well with what he wanted to do.