With small flocks, I think I would try the pin less peepers. They can stop a lot of behavior issues, without rebuilding everything.
You are tight on space, don't add any more.
You are tight on space, don't add any more.