Yeah, I totally agree with the direction Super is taking Goku's character. You outlined it perfectly. I'm just saying that it is canon. There isn't a strong argument that it's not canon, whether you or I happen to like it or not. It is indicative of what Toriyama apparently always envisioned for Goku per his own words in two separate interviews spanning over a decade and countless other indications he's given on related things.
I would disagree with the comparison of Goku to Luffy, mainly cause Luffy is not a sociopath and has actually likeable personality traits even though he tends to put on an act to appear dopey and outwardly unaffected. There are many scenes in which Luffy is clearly very emotionally upset and seeks to rectify what he sees as an injustice. This kind of reaction or thought process is never displayed by Goku, all we get from his the dopey outward attitude and then no actual substance underneath that either. Luffy also has very distinct and specific goals, which lead to a specific end point where he will be satisfied, and while he does seek to be strong he only seeks that in order to reach his goals and to protect his friends in that venture, anyone that has viewed the Battle of Marine Ford arc and its subsequent aftermath will understand what I mean by this. I dunno if Toriyama is a One Piece fan or not, but if he is and he wants Goku to be more like Luffy then he's sure doing a piss poor job of portraying that lol.