You only forgot one small detail, the first use of the word “Trap” in it’s present context in Hip Hop Music. It was in the Outkast song Spottieottiedopalicious back in 1998 from the Aquemini CD.
“Can’t gamble feeding baby on that dope money
might not always be sufficient but the
United Parcel Service & the people at the Post Office
didn’t call you back because you had cloudy piss
So now you back in THE TRAP just that, TRAPPED
Go on and marinate on that for a minute ”
Otherwise this is an excellent article!!!!!