I could see that.. but why have 2 of the same thing? We can see the massive structure from the queue, so there wouldn't really be a point.. unless like you say just for entrance sake.. I do still think they will add the Themeing Envelope 1, a lot of access was needed for the site, so something could still be put up over the closed season.. if it's just a cover (basically) then it wouldn't need much in making, however this would take away views of the ride, and be harder possibly for vehicles to access the ride if needed.
If it is in the shop.. I don't know what the theming piece is called in the Oblivion Queue line that you walk around on the lower section of the queue, but it could be something similar to that for the shop.. As for the train.. I don't think that would make it through the tunnels/head chopper moments, since its size is big
saying that though, I could imagine a face on the front of the trains, if there is 2 trains, 1 human face, 1 goat face (as to reference the structure possibly). This should probably be in speculation topic...
Don't take me serious..
But come, sit, have a drink.. don't mind me..
Hush little baby, don't say a word..
It'll only hurt forever.