I think they would do better making interactive experiences such real life wizard chess, potions class, experience the dark side of hogwarts in the dungeons, visit the Astronomy tower. One of the biggest problems is despite how awesome the castle tour is...its not tangible. Like you can't really interact with anything. It would make sense for them to expand them make things you can react to and interact with.
I also think Hogsmeade has already enough dining experiences and the great hall may be the thing were it doesn't make things feasible. However, the Great Hall was used for a great many things, (Triwizard tournament cup, sleeping quarters during attacks and bad things, exams, large scale meeetings)