Do what i do, build a huge communal dining room and bedroom. you can fill it with beds. then screen every migrant that arrives for the best of the best and give them their own private rooms, dining halls, offices etc on a floor made of gold, silver, platnium, whatever wealth you have. the plebs handle the day to day automation such as making clothes, growing food etc.
the upper caste are majority military (with high attributes. i dont take tiny flimsy dwarves into my upper caste, they can join a B team of soldiers that act more as last ditch reserves than the true noble upper class warriors. a bit of self defense training also makes them work faster in their day to day work) with some special exceptions such as legendary smiths, those who earn their way to the glorious upper class.
that way you have a swarm of worker bees you can ignore, and a group you can get familiar with and pay attention to.
on a side note, if you change population values make sure to keep it over 80 or you wont get the full brunt of sieges coming at you
you can even use burrows to keep the peasants in their place with the exceptions of haulers who can jobs such as delivering the highest quality food to the stockpiles in the dining rooms of the upper class. the burrows will keep the plebs out of the way too, if you enjoy watching a solitary hunter out hunting boars with wooden ammo. Its good to give your upper class a good testing. i like to give mine puppies that i later butcher to harden them until they have no attachment to the world and live only for the glory of the mountainhome. the kind of hardened dwarves who would massacre their friends and family in a loyalty cascade and remain uncaring.