Sorry for not replying earlier.
The Cuban Cigar Factory was by far the best we found mainly because they serve alcohol

Didn't even walk in the humidor, but purchased many drinks.
Smoked a '00' CoLa paired with Jack and Coke. Good times. Ended up carrying the wife out of there and grabbing a rickshaw to get us back to the hotel. That was the first night - lol. Smoked the rest of the time on the balcony of the hotel room in the evenings.
Thanks for the invite to the S.H.I.T. Herf, but was tied up Thursday night, literally. The wife gets wild. Maybe next time guys.
Thanks for all the suggestions. Great city..