I like Option 1 and then perhaps show up for special events with special sticks...
as for the selection... that really depends on the size of the humidor they will have in house... but I would say alternate between both heavy and mild pallets in both value and premium categories...
If I had 2 shelves I would put my light sticks from value to premium up top then have their darker cousins below... then whoever is selling them at the restaurant who might not even smoke will have a basic idea of how to talk to the customer through the selection and might even allow for upselling...