Power Flow including solar, batteries, home and grid

Current faults:

Daily history & one week of forecast: 2017, 2018.

half day, 1 day, 1.5 days, 2 days, 3 days, 4 days, 7 days, 14 days;

Next n days (includes forecasts from SolCast): next 2 days, next 3 days, next 4 days, next 5 days, next week,

Centered on runtime: 1 day centered, 2 days centered, 4 days centered, 6 days centered, 8 days centered, 1 fortnight centered. Below is 4 days centered on runtime:


I want to double both my solar and battery installation. It will be cheaper and easier to double the batteries, since they are smaller and we have room for them already, and probably easier to purchase (especially if we wait a few years, but I think now would be easy too), however it wouldn't cover all our needs to just double batteries for winter. Doubling the solar will be more difficult. During summer, we serve nearly all our needs even with the existing batteries on many days, but doubling solar is necessary for winter.

I also try to output my data to PVOutput.Org, but their system seems rigidly buggy and unable to handle batteries.