I'm not familiar with that plastic. What is it?
Yes, the new building will have water catchment. Everything (except my camper) here has water catchment, the shed, the greenhouse, even my chicken coop. Each time that I build/get something new I upgrade my solar. I started with 2 100 watt panels and a single 12 battery. Then when I got the shed I moved to a 4 100 watt panels on that roof and two 320AH 6 volt batteries and moved the old system to the greenhouse. My current system is also a solar/wind hybrid and is way more than I currently need. My next system will be lithium and more panels but that may not be until I build the Barndominium which is the ultimate goal but that's years away.
A well here cost around $25k for a solar one as they have to drill just over 380 ft to hit water so that's going to be a ways off as well but I'll start saving for that after I pay off the property in ~3 years.