1) Reduced need for energy storage. Right to repair for everything, write code that is efficient and lower power, distributed systems which don't require complex centralized systems to run. Taxes on unused compute cycles to help create incentives for this, perhaps.
2) For actual energy storage, something like the sand heat system recently put into use in Scandinavia, or the mechanical earth dams (store energy in potential energy mass, less dangerous than an actual water dam, a lot easier to build). For immediate electric storage at scale you can do e.g. saline water storage tanks which hold mild electric charge, who knows maybe there is some inert chemistry which could be devised for a safer transportable version of a lithium ion battery...
3) For energy production, I am a long time advocate of geothermal. There's no real downside, besides digging holes and I guess maybe a well collapse, but you're limited to loss of whatever is in the whole/immediate surrounding in the case of a cave in, there are no engineering problems to solve except pumping water around, which is a well known task. Solar/wind for ships, airplanes, space vehicles, electric/hydrogen for storage/consumption scenarios where the grid is not accessible (remote locations e.g. the poles, alaska, siberia, African/Asian planes)