Indeed. Rap is a sytle of vocalization, whereas "Hip-hop" is actually a description of a musical style. "Rap" is something that lends itself to any speech- related performance, be it music or poetry, or even non-rythmic monolouges.
I would submit with all confidence that the death of Tupac Shakur had nothing to do with the commercialization of entertainment. Nor is Sean Combs a cause of this, but merely the..... I'll say second most pertinent example. His pal Mace of course being the first.