I am HUGE into Afro-Cuban and Latin!
Do you have satellite radio? If you do XM has a salsa station where you can keep up with current trends (although some nuevo salsa is starting to sound like rap

). If not, try:
Live365.com: WJYC Jazz y Clave
Also, I don't remember seeing Paquito D'Rivera, Machito, Beny Moré, Dómaso Perez-Prado, Fania All-Stars, Juan DeMarcos and Afro-Cuban All-Stars (GREAT DVD!!)or Celia Cruz.
Watch Buena Vista Social Club for more ideas on whom to explore!!
Contemporary, I like Gilberto Santa Maria, Frankie Ruiz, and Pete Escovedo.