i think as time went on they highlighted things like kirk butting heads with admiralty or what not to lean into his semi rogueish reputation, but yeah during TOS there were times he went full boyscout. Although that kind of moralizing hero could be attributed to writing conventions of the era
i just watched Generations last week and he was literally shrugging off Picard's starfleet appeals lol