I'm definitely for creating EU directives that enhances digital privacy rights and sovereignty to block whole classes of privacy-endangering surveillance proposals in the future. That seems like the best solution to me. It's much better than allowing those proposals to be made again and again until they are passed in some shady package deal. Even if such a proposal is struck down by local laws, constitutions, or the ECHR, once they have the foot in the door, they will only be modified minimally to comply with the constitution.