Not quite.. I did some sleuthing.
When Be Our Guest opened the food was good - guests ruined it.
Anywho.. about the sleuthing: In cannon in Hogsmeade there's 3 broomsticks, Hog's Head, and Madame Puddifoot's. Hog's Head is supposed to be a full bar/tavern. So they could remove the little bar or rename the one at 3 Broomsticks and make a full size Hog's Head. Also, Pudifoot's, which is more a whimsical sweetshop with cakes and such.