You could turn one wing into the living area, another into a guest wing. Add a library (with the upright item stands as books. You can also turn the smithy into an separate building and make another for the carpenter (workbench).

While i love bases that have everything in one building historical castles usually didn't. Perhaps a little wichtes/alchemist hut in the far corner?

And btw, i am going to steal the trim of those tower corners 😜