The EFF has been carrying an immense amount of weight throughout all of this. I'm not sure I can name another organization that has done so much. Their budget desperately needs to be expanded dramatically.
Public Knowledge [ http://publicknowledge.org ] is shoulder to shoulder with the EFF. PK does the actual boots-on-the-ground lobbying in Washington that the EFF refuses to get involved in.