I've seen the updated trailer with the clip you mention. I thought it was better balanced, although still not perfect. I think they upped the spooky Pinocchio soundtrack too, and that did help to unify the clips part.

This trailer coincided with Marvel's big movie slate reveal, which didn;t have many surprises on it (at least not for those keeping up with rumour) but its nice to have it all confirmed. I'm especially keen to see the Dr Strange film, especially of they can sign Cumberbach.

I'm also interested in how they handle T'Challa, who is apperently playing a "substantial role" in Cap 3. The Priest version would do me fine.

I was mildly disappointed not to see a Hawkeye/Widow/Fury offering.

One rumour that mildly intrigued me was that Agent Carter might have an appearance by the human Jarvis. Maybe we'll see Howard Stark's 5th Avenue mansion too?

All in all, it's a good time to have been a fan of Marvel Comics 25 years ago.