Errand of Mercy sounds great. I'd love to see that done on a large scale budget, with modern technology. They seemed to be hinting at a Klingon/Federation war with ID. And Kirk and co. did shoot up a bunch of Klingon citizens on Klingon soil. An act of war right there!
Question is, who could play Kor?