The best map of Madrid is the Almax callejero, I don't know if it's available in USA, but it is a detailed street index updated with all the new streets and an accurate map, includes metro and conmuter rail maps and all the bus routes.