You are going to love the rain barrel set up! I've had mine several years now and it has saved me a ton of work hauling water in buckets. The nearest spigot is not that far away but I have to go through two gates to get to it, so the rain barrel saves me a lot of time and hassle.
I had the same issue with hens not laying where I wanted them to. Their favorite place was under our front porch which is low enough I have to wiggle on my stomach to get under there at all. The dogs can get under more easily so of course I was losing all of those eggs to the dogs. Due to the slope around the house, it isn't easy to fence off access to the front porch, so my solution was to stop allowing them to free-range. They have a chicken yard that is about ¼ acre so now they are confined to it for most of each day and that has forced them to resume laying in the nest boxes. Most days I go out around mid afternoon and open the chicken yard gate so they can come out and free-range the rest of the property. By then most of the eggs for the day are laid so I don't think I'm losing too many and it allows them to still hunt for bugs and forage that they can't find in the chicken yard, for the last 3-4 hours of the day. I was thinking I would "re-train" them to laying where I want them to and then resume letting them out all day but I'm afraid if I start letting them out all day again, they'll quickly go back to their old tricks.
Well, there is a little less testosterone at my place today. I had a couple of fall-hatched cockerels I'd been letting grow out, but I've been busy lately and they weren't on my mind so I've fed them far longer than I ever intended to. However I recently noticed there seems to be a lot more fighting over hens and it hit me that the young cockerels are now trying to have their turn with the hens and the bickering is the mature roosters attempting to stop them. An easy problem to solve. I did one of them this morning and will do the other later this week and that should bring some peace to the chicken yard.
Trish44 recently shared a graphic showing testicle size at different times of the year. While eviscerating this one, I could really tell that it is spring! His testes were the size of eggs - no kidding!!! I've butchered birds in the winter whose testes were so small it was hard to even find them - I certainly did NOT have that problem this morning.