Flaco Jiménez, Emilio Navaira, and more have shown how the two genres are more intertwined than you think.