Water catchment system ideas

With another drought year possible, I'm thinking about improving our water resilience both at home and on the land. Anyone have experience with rainwater catchment systems?

I've been reading about first-flush diverters and wondering if they're worth the complexity.

We've got about 5,000 gallons of storage capacity on the land now, which gets us through most dry spells. The first-flush diverter was worth it for us since we use the water for the garden.

Happy to show you the setup next time you're on site. It's not complicated, just a lot of plumbing.