You went to Tijuana, explains your dissonance issue.
Remember, as languages go, there is "Spanish" and there is "Mexican."
Not unlike "English" and whatever we in the U.S.A. speak (except for Boston, and certain parts of West Philly...)
Anyway, the LANGUAGE in Spain, is "el Cigarro."
Remember, the NOUN is incomplete without the article, with proper gender.
But, what people SAY in Latin America is often completely different, thus "el Puro."
When in Rome, do as the Romans do ("il sigaro"),
But, it's all Greek to me ("?? ?????")!
smoke 'em if you got 'em, regardless of what they are called!