At the time it made sense, we believed the US to be an ally, like in the past. Obviously not true anymore so yeah, a mistake that needs to be corrected.
And no, renewables aren't for the upper class, the sun is free for everyone with panels, and panels can be bought relatively cheap today.