How about fixing #3 & #4 first? I think they shouldn't be concerned with slaying the giant across the street when there's a couple in the backyard right now.
What's hurting Epcot is taking out cool rides like Horizons and World of Motion and putting in thrill rides to impress teenagers. I say that is a BIG mistake!!! Epcot have never been the same since.
Disney needs to stick to the magic and imagination. Leave the thrill rides for Universal and Six Flags.