Im going April 12-18. I am going to try the Habanos S.A. store. Im also going to try and find a non tourist spot. I will report back what I find.