I would consider doing all of the above.
Keep your gas generator. Invest in some decent solar as your backup to the backup plan. Thats essentially what I have done. I actually have two solar systems. A portable one with three folding 200w panels and a Bluetti AC200P. 2000w inverter, 2000wh LiFePO4 pack. That last part - the battery chemistry - is kind of a big deal. The Li-NMC cells we are used to talking about here on an ebike are good for the proverbial 500-800 charge cycles, subject to the usual BS about 80% charging extending this count, depth-of-discharge cautions, explosive risk and so on and so on. LiFePO4 on the other hand, is not a fire/explosion risk, is MUCH more tolerant of being left in a high state of charge for extended periods (i.e. charged and ready to go) and best of all, is good for about 3500 charge cycles if you do your part on the 80% charging (supposedly about 2000 cycles if you go to 100% - this according to Bluetti in their FB user group). Whats the catch? LiFePO4 is not as energy dense, so you need bigger batteries and that 'portable' sogen is about 65 lbs as a result.
I bought into this brand further and set up my DIY home system with it. An AC300 and three B300 packs for about 9kwh of power - I bought in on their introductory prices and saved a bundle. I bought used 200w solar panels (commercial building take-offs) for a fraction of the cost of new ones, and they perform very well.
The caveats about using solar to replenish in bad weather are entirely valid. I've personally had real good luck with mine both at the campsite and at home. One thing that can happen with my home locally is the storm can blow thru and trash the power grid of
solar powered generator. It takes the local utility a few days to fix things and thats after the storm... when the weather has cleared up and solar can top up... and since I have the equivalent of a full tesla power wall in batteries, I can go for some time without having to throw away the contents of my fridge and garage freezer. Now, I don't have to go to lengths to find a gas station that has power to its pumps, and then do a cage match with all the other generator owners to see who gets to get in line.
Last time I had a power outage, I didn't even lose my internet. Switched to my phone for a wifi hotspot, used the solar and refilled over the next two days. If I had all my panels set up I could do it in one.