For those interested, a picture of the original Kirk/David fight from TWOK is in the Star Trek: The Wrath of Khan movie magazine from 1982. Kirk is on the floor, and David is standing over him with a knife.
Just thought I'd mention it. The magazine itself is cool as well. There's cast interviews ad even some storyboards and production photos. Good read, try to pick it up.