You can't just demand that technology advance at the pace you want it to. You can try your best, certainly, but to simply expect the alternatives to be there waiting is ridiculous. Don't depend on what you don't have.
Which would mean that an increase in number of electric cars should be accounted for by the graphic as an increase in fossil fuel consumption as well. I don't have any stats on hand, but I would bet that a majority of batteries are charged with fossil fuel energy, simply because it's the cheapest energy around, and manufacturers need to make a profit.
It looks like we've hit global peak, yes, but it's hard to be sure. I went with the phrasing "long before then" just to be on the safe side.
Sadly? We're in no position to be picky about where we get our energy. We currently have no viable alternatives to oil. Combine all the different renewable energy sources you want; they'll never fill the hole left by oil.