Big update: Ever being the perfectionist, I rebuilt the entire engineering section again. Just wasn't happy with the shape. It's all just detailing to do now. Lots of detailing!
Edit: Forgot to add, the main reason for remodelling the secondary hull is that I realised the saucer was way too...