Plot hole: The ambassador and his aide beam down to the planet. This would not be possible because earlier on Scotty refused to lower the screens/shields until the Captain told him to do so. It had already been established in an earlier episode titled "Arena" that transporters don't work with screens up.
Plot hole: The law officer who arrests Kirk recalls hearing Kirk call the "spirit" Bones. But he wasn't there when Kirk spoke to McCoy. He rushed into the scene several minutes later. If he's lying, how would he know that Kirk used the name Bones? He wasn't there to hear it. Even if he had been, Kirk did not refer to McCoy as Bones in that conversation.
Plot hole: It is stated during the episode that Khan was, at one time, the ruler of over 1/4th the Earth's population, during a very key moment in the planet's history (The "Eugenics" Wars). Such a personage undoubtedly would be very well known to 23rd century Earth people, at a level of infamy approximating Julius Caeser or Adolf Hitler. Yet it is only 2/3rds the way through the episode, thanks to a computer search by Spock, that the crew divines his identity. Lt. McGivers at the very least should have almost instantly recognized him.
Other mistake: In the final scene, Kirk is still in the transporter room, but does not have on a visor when the ambassador transports out. Spock has his visor on, but then you see Kirk walk out of the transporter room without a visor and he is not going mad.