Indy -- it's just too rough. Actually, I think I like the queue better than the ride itself! In fact, sometimes I find myself wishing that the line were more slow-moving, in order to soak in more of the atmosphere.
And though I haven't yet been on the "new and improved" Matterhorn, I'm afraid it's off my list -- at least until they re-do it again (please!). Used to be one of my very favorites. So sad that it's been ruined.