Re: "I'm a soldier not a diplomat."
TOS was inconsistent on many levels, more than most of the new shows in fact. I prefer to think of Kirk the one-dimensional military man to be a product of the same effort to establish the show as UESPA and the like. If Kirk was always written like this he'd be a distasteful character. Compare to Picard...prepared to fight a war in Redemption, but very reluctant to do so.
I don't think "one-dimensional military man" was ever intended to be Kirk's characterization, so it isn't the same thing as abandoned concepts like UESPA.
The boring one, the one with Khan, the one where Spock returns, the one with whales, the dumb one, the last one, the one with Kirk, the one with the Borg, the stupid one, the bad one, the new one, the other one with Khan.