Wow, where have I been? lol. I missed an update!
Your DHS plans look a lot like ours. TSMM with a side of FP, followed by ToT and RnRC, probably another FP when it's time. We have to try the new Star Tours, and my personal favorite, TGMR, then finally some shows. I think we'll skip B&B this time, we did it on our last trip and it's a longer show. I'd like to see the Little Mermaid show again, we haven't done that since 2005. And Muppets, since this will be our last chance (assuming it goes when the new Star Wars Land arrives).
Jiko sounds fun. If it's anything like Boma, I think you'll love it. That was Matt and I's favorite Disney restaurant so far. He's a meat lover, so that was a big pull. But, we also tried some of the more unusual fare and really enjoyed it. There was a soup (squash or something, it was orange and creamy anyway), mmmm mmmm mmmm. I still think about it.

I could have eaten that for my entire meal.
And, of course, Jiko and AKL just fits the theme of your proposal to perfection! One question? Are you keeping each day, each meal, a secret during the trip too? Or will you fill her in on the plans once you get past the proposal part of the trip? Not sure I ever asked you that...
Good Luck with your Hints and planning, it will all be here before you know it.