I have dealt with this so many times. It does look like everything is settled for now at my place. You are certainly right about one thing though, more choices seems to lead to less squabbling. Good of you to realize and help them out.Ah! I remembered a chicken development to share.
I think everyone knows that when the pullets arrived, Ivy took to roosting on the uncomfortable rafter, so I put a branch up there for her. Then Peggy needed to get away from from the aunties at roosting time, so I provided two intermediate roosts for hopping and hopping, up to the top with Ivy.
It wasn't long before everyone was going all the way up and the squabbling really took off, but by then then new girls were more sure of themselves so I waited for them to settle their own disputes and establish a suitable arrangement.
After a few months I realised they're probably never going to reach an amicable roosting arrangement without more space, so I put a second big branch up there.
That was a month ago and for the last week, Janet (the main trouble maker - maybe she was anxious about her eye - but then she's always been a nightmare about roosting) has decided the new branch is her branch and she puts herself as far away from the others as she can, which suits them fine!
So now, each night there's the habitual complaining from Janet at the far end of one branch (from which spot she's too far away to peck anyone) and the other three happily snuggling up on the other branch.
I love how little changes in the chickens' living spaces can make such a big difference to their contentment.