Haven't had much of a chance to do much with this project, but tore down two of the larger structures, and filling in the gaps:
The large temple structure that was in the bottom-right has been taken out and I'm planning on making the entire "southern" bailey (I say "southern", I think that's actually to the west, but oh well) more of a militarised centre, with a two military hospitals (there's the beginnings of one in the updated map, which, I think, has about 170 beds in it), and then a fairly large training ground to the eastern end of the bailey where larger manoeuvres can be practices, as well as horse-riding, long-distance archery, etc.
The church building that was in the northern half of the central bailey has also come down now, replacing it instead with a sort of "administrative district", with a building in the north-western corner where the monarch and the head of the eight noble families, as well as, I suppose, elected representatives (I think it was 14) can meet, another building in the north-eastern corner which would be a centre for taxation and distribution of resources for the city as a whole (dealing with how much has been brought into the city, how much each household will get depending on status, needs and any future storage for winter months, etc.), and then I'd think the regions to the south of those structures would be, say, a public forum and a central market area respectively.
I've also formalised the military sections, with each "squad" building housing 10 soldiers and 2 servants/slaves, each squad then has access to a bath house and mess hall, as well as their own blacksmith (which includes accommodation for the blacksmith and a servant/slave/apprentice of their own who helps them with work, cleaning, cooking, etc.), store houses, and stables. The small garrison in the southern section of the central bailey, while still containing enough space for a squad, only includes space for a bath house, mess room and stables, and I'm thinking that's because this wouldn't actually be a typical "squad", but sort of a combined mish-mash made up of various military leadership ranks within the city, assembled during "state events".
That does mean, though, that I need to move the city's main religious centre, but I might go for something smaller and then have a lot of smaller chapels spread out across the city.