I also think the nest boxes will be fine. I would take down the upper roost. I can't tell how high up the bottom roost is. Bring it farther from the wall so you can add a second one behind it. You might not need a second roost. How many chickens you got?