I agree with you about the West African source. I would include Afro-Cuban music as an important descendant--some of the most exciting music of the 20th century, with less influence from European traditions.