Campaigners want changes to Snooper's Charter in place by July after court found portions 'incompatible' with EU law