The Forbidden Journey is also my favourite ride of all time anywhere...they really knocked it out of the park with that one...and the whole Wizarding World in general...if only it were larger (and at Disney)!
If you're considering eating at City Walk, may I suggest the Hard Rock Cafe? It's never disappointed us when we've gone. Since you're doing the HDDR later on that evening, maybe split a few appetizers so you're not totally stuffed when you leave...just a thought
Also, the Little Mermaid section of AoA looks really cool! Well, all of it does, but it's even more awesome you'll be among the first people to stay in the rooms.
Here's to just 9 more days at work before you leave!