My responses
You did not include hydro electric generation.
That is because it is already in widespread use and is nearing saturation.
Storage and transportation could also be in the form of metal hydrides.
I mentioned metal hydride batteries.