Great topic. That said, I could see a few rides coming and going in the next 4 years but not because of movie tie-ins or upgrades but rather reaching their useful life span (see Scream Machine). There does come a point where some of these rides will need massive overhauls and they will need to weigh if it makes more sense to replace or rebuild. I particular, I sincerely worry about the Log Flume and the Sky Ride but that's just me. I've heard nothing about them going anywhere.
Nitro is an interesting situation due to it's location to what will ultimately become a full-blown justice league HQ. Perhaps it's location combined with the fact that it's in dire need of a refresh, could result in a movie tie-in.
And for number 3, either way, regardless of what type of ride, I do believe we are in for a major coaster of some sort in the next 4 years. I hope!