I agree. I mean, they're both essentially tackling the same themes, except cyberpunk is couched in a rebellious, "fighting the man" setting, and steampunk/clockpunk is couched in the setting of the British Empire's glorious, unquestionable supremacy.

Well, the bad steampunk is.

I'd use the term steampunk than clockpunk, but that works too. I love it when people mix in the genre, it's so fun.