The linked article does take into account all those other uses of energy.
Again when you refine or produce OIL you don't just get one or the other. Most of the power generation in Mexico (over 50%) is literally just the waste NG from producing oil from the shale in western USA. (We were previously just burning this off at the wells btw)
A significant overcount would be confusing primary energy with work. A joule of electrical energy can replace more than a joule of primary energy.