I highly recommend Churchills. They've got 3 locations but I think the West Bloomfield shop is the only one with a bar. Great selection. Not the closest to you, but if you're in the area, it's worth checking out.
Churchills of West Bloomfield
Wine/Liquor & Cigar Bar/Lounge
6635 Orchard Lake Rd.
West Bloomfield, MI. 48323