For the Haunted Mansion, maybe the queue can go through the Jungle Gardens before leading directly into the Mansion preshow.
I think the Haunted Mansion backstory should go something like this:
Mr. Sage (Sage is French, the official language of the Congo, for wise.) was once the proud owner of the Jungle Cruise company. Every day, countless tourists would board his company boats to go on tours to explore the beautiful Congo rain forest. Unfortunately for Mr. Sage, the nature spirits of the Congo didn't like his business all too well. One night, the spirits warned Mr. Sage to stop sending guests into the rain forests and leave them and the creatures of the forest free from observation. In an act of arrogance, Mr. Sage refused, wanting to keep his business afloat. The spirits got angry at him, and poor Mr. Sage was sent flying out the manor window into the river below, into the mouths of two hungry crocodiles. The spirits, in an act of revenge, continue to haunt his former manor, now falling into disrepair, before unknowing tourists (park guests) enter the halls of the mansion.
Any suggestions?