And as an aside, the mere fact that it started as 'The Gorn Incident,' ignoring the fact that 'Arena' was the first contact situation, appalls me.
To be sure, nothing in "Arena" really nails it down as a first contact. The Gorn might simply be a species that has stayed relatively quiet as of late, so that Kirk has little knowledge of them - just like he has very little knowledge of Romulans in "Balance of Terror", even though the first contact with that species is decidedly old news in that episode.
Of course, I greatly appreciate the move from Gorn to Andorians. Otherwise, we wouldn't have gotten Shran. Or then everybody's favorite Trek villain actor would have had to wear a rubber lizard suit... Although I'm sure Jeff Combs would have pulled that off, somehow!
Picard did say the first contact with the 'space cavemen' LED to decades of warfare.
But he also considered that first contact "disastrous" by itself. Either he was bending the truth a little to better convey his message, then, or he was referring to some other event that later history came to know as the true first contact between the Klingons and the...
...Indeed, and whom? Picard never says it's humans. He's representing the Federation, not Earth - perhaps he is speaking of a disastrous first contact between Klingons and Vulcans.
Timo Saloniemi