^Interesting thought. Adding another few episodes to the mix, "Dramatis Personae" could work well. Although it is somewhat similar to "Day of the Dove," so maybe it's not the best choice. "If Wishes Were Horses" kind of reminds me of "Shore Leave," so maybe not that one, either.
"Nor the Battle to the Strong..." would have resonated powerfully with a '60s audience because of Vietnam. Having someone like David stranded on a war-torn planet with McCoy (like Jake with Bashir) while Kirk searches for them would be an interesting premise for a story.