My numbers might be slightly out of date. It makes sense for energy generation to have grown recently.
For oil and gas energy usage, you should take into account that usable energy and energy consumption are two things. When electrifying, you typically end up needing less energy overall. The notion of replacing oil twh with solar twh is simply wrong. This is something the IEA gets wrong in most of its reports. Which is one reason why their estimates and predictions keep having to be corrected by them every few years.
A good example is ICE cars vs. EVs. A gallon of gas represents about 33.7 kwh of energy. A Tesla can do over 4 miles per kwh. Most ICE cars get nowhere near 120 miles per gallon. Anything over 1 mile per kwh of gas is actually pretty good. Especially for bigger cars. So, an ICE car wastes about 70-80% or more of its energy (heat, noise, vibrations, friction, etc.). You see the same pattern in other sectors where electrifying usually also means improved efficiencies. Most Teslas only have 2-3 gallons worth of kwh in the car. An ICE car with a tank that small would have a terrible range.
So, a doubling or tripling of electricity generation might actually be good enough to replace most fossil fuel usage.