I'm not familiar with it, but I suspect you're correct that a simple perimeter would be an improvement.   When I was looking at it earlier I thought the buildings made up Church House, so the school was scattered throughout.  But know I realise that Church House is separate, so the school is probably not a complex shape interwoven with other building uses.