You might have noticed a hiatus on this project, but finally I returned to it to finish off the floorplan: here it is. The rooms were generated mainly by using polar coordinates around the space defined by the corridoor end points, and turned out to be relatively straightforward.
At this point, the project really needs to switch away from pyglet to something more useful, that can do the needed 3d extrusion more easily...