I think you are right about steampunk, but cyberpunk does have an element of an anti-authoritarian counter culture (hackers going up against tech oligarchs). And solar punk evolved from there and is more explicitly political, although more utopian and I agree there is a bit of distance in the meaning.