They cleared up the TOS Klingons discrepancy in an episode of Star Trek: Enterprise (Season 4 episode 16, “Divergence”).