I definitely agree that the movie-set storyline needs to go. Goes over way too many people's heads simply because they didn't have to stand around and watch the queue videos. I also think there's plenty enough room when you enter the building to put the lockers inside if they wanted. Way more queue space than necessary 99% of the time.
Yea...but let's be honest, most people don't give a crap about the story.
- - - Updated - - -
Of course, I'm of the opinion that Studio parks really need to dispense with the mirage of production. Things like Disaster work though.
Disaster and Horror Make Up work because they're so over the top with their "fake movie studio" stuff. They don't take themselves seriously as shows like LMA and Indy Stunt Show do.