You might look into a water tank, even something temporary. Maybe buy a larger backyard pool on clearance or a large tank something that you could run your generator or your use your solar to fill. That way you don’t have to run it all the time and yet you could keep a good quantity of water readily available.
Having lived through three hurricanes, the first thing to go are containers for fuel, even before the stations run out of gas. Everyone should have containers for water and gasoline. I keep six, empty 5 gallon gasoline containers that have seen use in all three hurricanes.
It's a simple matter to run down to the station and fill them up at the first sign of trouble. It's what you folks on the East coast should be doing NOW! They will quickly disappear in the stores as the hurricane approaches.
What works for me is two main storage areas. Just bought food goes in long term storage. The pantry is for short term and gets replenished from the long term storage area by the rotation method you mentioned. Everything gets the date purchased magic marker treatment. Once a year, a complete inventory is taken. From the inventory, future meals are planned, some things in excess are put into gift boxes for others, and food/items short are purchased.