So, here's a pitch for a different layout for the Main Street!
View attachment 498737
Have it sideways pointing out at a 7 Seas Lagoon type lake. 1 direction heads to the Shopping District and a bus hub for hotels (maybe a walkway to the other park too). The other way heads to monorail stations and other TTC stuff for day guests.
Both sides of the street could have slightly different thematic focuses. Like one side is more spooky and one side is more historical perhaps.
The more important buildings like guest services and Emporium can be more to the center of the hub. The more specialty and destination stuff can be more near either entrance since those are things guests will seek out.
One entrance can be the library and the other can be a train station or museum.
The large lake connection can give us a real seaside feel. Boats in the harbor. A show at night.
The lighthouse gives us a Boston weenie to draw us to the center and as we get to the center town square we get the dramatic castle reveal.
The two paths will split the crowds for entrance/exit allowing us to avoid overcrowding without needing the giant wide paths Shanghai used or needing a bypass.