I wouldn't mind Aurora trading spaces with Snow White. The Bavarian-influenced Sleeping Beauty Castle at Disneyland really belongs to her, anyway.
How about a rechristening at the end of the 50th Anniversary celebration to commemorate the beginning of the next fifty years?
Cinderella Castle (at the Tokyo and W.D.W. gates) and Le Chateau de la Belle au Bois Dormant (at the Paris gate) are decidedly French since France claims both stories as its own. Snow White Castle (currently known as "Sleeping Beauty Castle") in Disneyland feels much more German. The reason is because Sleeping Beauty took residence there at the last minute.
The castle rightfully belongs to Snow White. Aurora has her own castle at Disneyland Paris now. She needs to give the place back to the fairest of them all.
Walt Disney had intended for Snow White to have the castle originally, and, if you look at it closely, you can see how it suits her so much better. He made the decision at the last minute to give it to the sleeping beauty, Aurora, because the film, "Sleeping Beauty", was about to be released.
The castle clearly looks more Bavarian than French. "Snow White and the Seven Dwarfs" also enjoys the distinction as being the original Disney fairy tale, so giving the story and its heroine the honor of occupying the centerpiece of the original Magic Kingdom would be absolutely perfect. And, what better opportunity for a rechristening than the 50th Anniversary celebration?
Disney needs to commemorate the end of the celebration in an historic way so as to close one chapter in Disneyland's history and begin another.
The castle would remain relatively unchanged, I imagine.
Obviously, the murals near the backside of the castle would need to go. I never liked them, anyway, because they undermine the fantasy. And, now that the "Sleeping Beauty" diorama is no more, the walk-through Attraction no longer presents an obstacle to a change of ownership.
With Snow White's existing grotto and wishing well, I can see the way that the entire conception could come together and be instantly recognizable to Guests. And, I think Snow White, as a person, has a charm that is uniquely appropriate for Disneyland.