I agree, and like this version a lot more than the first.
But the problem with it is that in it's current state, it's not "timeless". I think this has been discussed before. Disney has always made movies and attractions that wouldn't get "dated" (i.e. Pirates, HM, Splash)... And the popular feeling is that they first broke that rule with the movie "Aladdin"... All the Robin Williams jokes that 50 years from now no one will get. Then it bled over to attractions, with this one as an example. While the gags are still recognizable and funny right now, the longer the attraction stays like this, the less relavent it will become and something will need to be done. Even now, when people see it, it's easy to recognize it's been that way for a good while. It's only going to get worse.