At an 8% growth rate, wind generation will double in about 9 years. At a 20% growth rate, solar generation will double in 3.5 years. So your estimate of 1% per year growth in the share of electricity generation is way low.
And with wind and solar both being cheaper than coal and natural gas, their growth rates will increase. There are already projects in the pipeline to ensure that will happen. More renewable projects are planned than gas and coal combined. More coal plants and natural gas peakers are being retired early and being replace by wind and solar.
Wind is 7% of electricity generation, that is 0.07. 8% (0.08) times 0.07 = 0.0056.
Solar is 2% of electricity generation, that is 0.02. 20% (0.2) times 0.02 = 0.0040
Add them together 0.0056 + 0.0040 = 0.0096 (less than 1%) for 2019. A few (3-4) years from now it will be a bit higher than that, but the average will be "about 1%".
The solar and wind industry associations do not agree with your assertions on growth during the next few years. I tend to trust their forecasts (as against the IEA's and EIA's) given who they are answerable to. The new US tariff on imported solar panels (the vast majority of panels) plus reductions in US government support will act as a drag on growth. Part of the problem is that as panels become cheaper governments keep offsetting the price drops through cuts in subsidies and stupid tariffs (in the case of the US). At some point we will reach zero subsidies (and hopefully tariffs), but by that point the costs of the panels themselves will represent a very small part of the overall implementation cost. In the absence of a significant carbon tax this is unfortunately the reality of the situation.