Thanks guys. I'm working on the S2 layout and doing a little fine-tuning. Afterwards, going to start laying down cabins and hallways based on the s1 episodes. Might do the TWOK torpedo bay though to see how much room I might need in the TOS version.
@Albertese - the idea of the large cargo bay in TMP as where the old machinery was is starting to look very plausible. The general locations are about the same and when I put some wall and ceiling framework up (TOS-style) it does look like the future TMP setup!