I come from a long term boating environment and ethanol is a major issue. We always stored our tanks full for winter layup to prevent condensation and hence water in the tank HOWEVER since the introduction of ethanol things have changed dramatically and it is now recommended to store with an empty tank. Good news is non ethanol gas is available at almost all marinas. Ethanol absorbs water from the air. A car is better off since the fuel system is pretty much sealed as compared to a boat where it is vented to atmosphere with basically an open hose.
Bottom line is I would fill with non ethanol gas if storing, not only does it not attract water, the shelf life is much greater. I actually do this for my Mercedes. Interesting video here. https://www.youtube.com/watch?v=YeCyFxoWPpo
So would I; in fact I would use ethanol free gasoline all the time if I could get it. Politics and EPA rules (same thing) require ethanol in most gasoline sold in the US.