It’s hard to hope one way or the other until after I’ve seen the movie. For all we know, half the songs will make a return (see what I did there), the movie will revisit old places (such as the chalk drawings and carousel horses), and then the chief difference in the ride will be in whether the Mary animatronics vaguely resemble Julie Andrews or Emily Blunt.
Heck, it’s supposed to be the same Mary, so they could feature scenes from both movies and get away with it so long as they keep the focus on her.