So after lots of thinking and looking at my scrap material... I managed to make this really awesome "mini hoop coop"! Currently I have one of my younger unfriendly roosters in there until I've found him a forever home, but do I plan on making a few more for my breeding roosters I'm not using!
This is the water situation, I think it's pretty efficient but I will obviously need to refill it once or twice a day
The roost bar is a biiiiiiiiit high but he can still get to it fine