There's a great little shop in PV called Vallarta Cigar Factory. They roll them right there and have a nice size humidor of all their cigars. Very nice cigars...all Mexican grown tobacco with assorted seed. They have an aged selection as well.
I really have enjoyed them and stop by every time I'm in PV. The staff are very helpful and you can sit down, have a drink and a nice local stick. It's right by the bridge at the flea market in old town.