I'm sure this will ruffle some feathers, but I vote for CoP...
...now hold on a minute and let me explain
Let's face it, in the hands of MK management, CoP has been left to die a slow, painful death (although there's new carpeting...too bad some of the AAs look terrible, and I cannot stand to hear the phrase, "You're not going to talk about the old days when you didn't even have a car phone?" or any reference to 'blink and you'll miss it' laserdiscs one more time).
I love this attraction, and that's why I'm suggesting this. Send it back to it's original home (well, after the World's Fair), and put CoP back in DL, where they tend to take better care of classic attractions. People in CA would go
nuts over a return, and it would undoubtedly receive some much-deserved and -needed love.
Then, in addition to knowing one of Walt's original and best (IMO) attractions is being treated properly, MK's Tomorrowland can welcome a cutting-edge attraction (perhaps even take out the stage next door and do something huge)!
Does that soften the blow a little?
Truthfully, I'm only suggesting it because I grew up loving this attraction and I hate to see it in the shape it's in.