As for the thrill coaster, I still have a feeling that we’ll see Flying Dinosaur somehow. I know this forum hates the idea, but it’s simply to easy of a choice for Universal: It’s a clone, it’s cheap, it fits perfectly, and it’s one of the highest-rated coasters in the world.
If it’s not, a wing or inverted coaster could work as well.