Trying to boycott any oil company is pointless unless you want to live as a pre-industrial sustenance farmer. All you can do is hope solar and clean nuclear technology becomes more practical before we completely destroy the planet.
Nuclear power is as clean as it practically needs to be. The fearmongering over nuclear waste byproducts is silly. That said, what we actually need is battery technology. One of the primary reasons that fossil fuels are so valuable is that they store a shitload of energy in a very small package. Hydrogen technology may get there, but it's too early to tell.
And it's not about "hoping." All your hope and seventy-five cents will leave me bumming a quarter to get a cup of coffee. You want to do something? Lay out a plan to become a chemical or nuclear engineer or a nuclear physicist, and follow it.
Hmm... Since the avg price of coffee is about $1.50 a cup, that means each person's hope is about $.50... So all I need to do is steal the hope out of every person in the world, and I can become a billionaire. I never knew becoming an evil genious trying to take over the world was so profitable!
The problem with nuclear waste is more an issue of quantity. Yuca Mountain was cancled, and so we really have no practical place to keep it safe indefinately. Reprocessing is way too expensive to be economically viable without several decades of constant uranium cost increase. I did hear some vague whisperings about fusion-fision hybrid reactors capable of using up said waste, but I haven't yet looked into that claim... If that works out, nuclear is quite a good plan.
But as you said, battery technology is what is really needed. All the nuclear in the world can't save us if we can't use the electricity generated by it to power automobiles. And with ranges of under 100 miles per multi-hour recharge, current batteries just won't cut it for most people's daily needs. Hydrogen really isn't a very viable alternative as a fuel source, since it would need an infrastructure equalling if not exceeding that of current gasoline. Gas powered cars work so well as a mode of transportation because there are multiple gas stations in every town, village, and everywhere in between. There can't be widespread hydrogen adoption without widespread hydrogen infrastructure. And without widespread hydrogen adoption, there is no business incentive to create hydrogen refueling stations.