The long term solution is probably a combination of technologies - hydrogen and solar to power some propellers cleanly, batteries to regulate the solar and wind power, new and improved "sails" like this, channeling energy from waves, new types of coating that significantly reduce friction and increase gliding factor, new much lighter containers to reduce total weight, etc...