On the EFF stuff about pushing companies to stand with their users it's worth remembering that after web 2.0 the user was no longer the customer and so the business incentives changed massively. Encouraging companies to go against their customers and side with the users is always going to be a very hard sell.

So if you want to pressure companies in this way you'll have to pressure them to change their business models. Doing anything else will just be like deckchairs on the Titanic.