Just to say that IF Folwark feels too much comitting and needs a buff, there is one simple thing that can be done : let it garrison villagers (without firing of course, like Khmer house)
I would advocate that they should be able to garrison EXACTLY 8 villagers in this case, for obvious PERFECTION reasons.
I’m not saying it should be done, it’s just a backup plan.