Actually, I went with both. The solar panel is great for keeping a charge on the batteries. The generator is nice when I'm making coffee or running the AC, vacuum, etc. I used to have to run the generator for about three hours to charge the batteries. Now, I only run it long enough to use it when 120VAC is needed.
Another option to investigate is getting an inverter to go with a solar charging system and your battery bank. The inverter converts 12VDC to 120VAC. Of course, you have to have enough battery capacity to run any 120V appliances for any length of time. But it's great if you just want to run the television for a while, etc.