Yesssss!
And Epy wins again.

I'm starting to scare myself with my persuasive skillz.
Just one note. Remember what I said about every inch needing purpose? Still applies. The new layout is tons better, but the interrogation room and the mess hall should be moved up into the main of the building. For two reasons. One, those both are rooms where prisoners go. Thus, they would want those building int he center of the complex, not on the outside, where it would be easier for them to escape. Also, you've got two holes in your building. Every inch would be used in a real building. It's also more interesting. You can also make the mess hall have two more exits. Like, top and left. So there's more pathways to get around. Which is also more interesting.
One more suggestion: it would be cool if you had the outside area on the bottom area of your new plan, and the mines be the end of the top portion of the map, instead of two outside areas, as originally planned. That would be more
awsomer, especially since the mines are so freakin' vast.
Oh, could you resin the flood control room a bit? Right now it's screaming death star.
Other than that....dang. It's so awesome.