They'really apparently going with both, according to insiders. From concept art, Zootopia would be tucked away into the corner.
And Zootopia was definitely written first to be about animals which evolved to be intelligent, according to the creators.. Human-related themes may be important, but they don't wipe out the animalistic nature of the characters. The audience does pick up on this: just ask
http://www.reddit.org/r/zootopia . They definitely agree with the creators that the movie is about animals.
Those are the aspects which will likely be highlighted.
Anyway, I'd say if there is any hope for Dinosaur, it is Zootopia. The movie featured a natural history museum, and Dinosaur could be tweaked to be about finding early mammals during the age of dinosaurs.
And, heck, one of the façades I see in the Shanghai attraction is that museum!