Those were my 2 suggestions so it looks like you’ve gotten the info you need! There really aren’t very many restrictions. We’ve looked for our upcoming trip too as DD is only 10 mo and about 29". We don’t do the “thrill” rides anyway so the only thing we’d do that she can’t do is Soarin’ so no big losses. Have a great trip and take advantage of the “baby swap” for rides you don’t want to miss out on.