I don't think I would make the bar/retail any part of your legal distillery (DSP) at all. The bar/retail may be a part of your distillery business but they are not a part of your legal distillery from the point of view of the TTB.
So you should make three areas within your building: legal distillery, bar, retail. Your distillery is your DSP and what the TTB regulates. The bar and retail are regulated by your state laws.
Within your distillery, you would have potentially two main areas: bonded and unbonded (general) premises. Bonded premises are where all your alcohol is made, stored, bottled, etc..you have to have the alcohol in this space insured and you pay your federal excise tax once your alcohol LEAVES the bonded area; no matter where it goes.
General premises is maybe offices, storage, etc..where no unpaid excise tax alcohol will be stored. If you decide you ran out of room in your bonded premises and want to store bottled and boxed alcohol in your general premises you would have to pay the excise tax on it even if it's not sold. Most smaller distilleries are probably in 100% bonded premises.