I would stick with HBD. We had the Fantasmic package with Mama Melrose and were very disappointed. Slow, poor service and mediocre food. We will not go back to MM. Worst dining experience at Disney for us.
We arrived about 15 minutes early for our reservation. The restaurant was slammed crowded. It was raining and everyone had come inside. Elbow to elbow. When I checked in, the hostess frowned and informed me that there was no way we were getting seated early because they were on an hour and a half wait (I did not ask to be seated early).
We did get seated right on time, but our server was not very impressive. We asked her about out Fantasmic package and she acted as if she had never heard of such a thing. She had to go ask someone else.