Unwrap done!
Since this is a 1024 texture, I have decided to halve the floor (it was quartered for the practice model), which will mean that repetitions on the detailed diffuse will not be a major issue.
The glass sections I have halved, with the exception of the largest (centre) glass section, which is slightly more than half, to prevent the texture seam from being in the middle of the glass (instead it is at the protruding frame).
Since there is less UV stacking, it will also be a lot easier to do an ambient occlusion map once I have rebuilt the model.