Im going to repeat myself every few months in the hopes that UC is reading.
Take out the Hogshead and make it standalone. In reality, it is a staging room (with a functioning bar so you can drink while you wait for your reservation) have Arianna Dumbledore's painting become a door like in Enchanted Tales and use the tunnel to get to the great hall resturaunt. Make the tunnel a little winding, maybe some faux elevation changes using temperature control and design so people think they're actually walking towards Hogwarts. It's cannon, and allows for the resturaunt to be wherever they would like on the cleared land as long as the show building is hidden.