To be honest I would love to stick to the first version, I really like the idea that the cargo can be dropped off, it makes much more sense to me this way as a design. On the other hand I would like to make it accurate and the first version just doesn't allow for the interior seen in the movie..
It's a tough call, I'll have to think about it.. that said, I'm leaning towards the latter at the moment.