You're placing too much emphasis on subject matter, Nas isnt a subject matter rapper, he's in the same category as Big L, Mobb Deep, Kool G. Rap etc. in that his talent is in his overall delivery, his flow, multies, metaphors, wordplay etc.
Hip-Hop is more about subject matter, Rap is more about lyrical ability.