More like Disneyland? You mean 25% shorter?
Seriously, though... have you been in WDW's HM lately? It looks better than it has in a good long while (ah, the wonders of a change in management, from what I hear tell). Now, I'm as obsessive a fanboy as any you're likely to find, and when I went through last night I could count on one hand the number of "problems" I could find with the attraction. And that ain't bad.
Change - good change - is happening over there slowly but surely, and without the need for closing the attraction for an extensive refurbishment.
As for the Keelboat building: I've said it before and I'll say it again: It makes no sense to put a gift shop for an attraction at the entrance, and not at the exit (which is why I have issues with the current location of Leota's Gypsy Cart, which is, IMHO, way too far away from the HM).