In regards to "war" with the Klingons, my reading of Errand Of Mercy has always been that the Federation and Klingons are on the brink
of war in that episode, not that they've been fighting one already. They've clearly been in conflict, yes, but has it escalated into war? I think Kirk and company are anticipating
a war, before
the Organians step in and put a stop to it.