Now we have to build this concept into a fort. Every dwarf, save a force of haulers, gets everything he or she needs to be productive enclosed in a small area they are restricted to. They live in isolated pods, with workshops, beds, furniture, and the occasional statue.
Then there's the working force, haulers, soldiers, and traders.
They can access the pods as long as they aren't locked down, and otherwise live in a small, not very social community.
Most haulers will become soldiers. Soldiers are the most social of all, living together, sharing a dormitory, training space, stockpile, and medical bay.
Each pod is connected by materials collection system, which allows for items a pod dwarf makes to be dropped into quantum storage for minecart collection, and a separate quantum stockpile for reverse: dropping items in. In this way the hauler/soldier class is mostly if not completely isolated from the pod workers.
This requires micromanagement but also relieves some tensions, as a cyclic system emerges where the only certain death situation is when your hauler caste dies completely. If you build the lockdown system correctly, the only problems you'll ever see with tantrums is within the soldier caste where it will either resolve itself or escalate beyond control.