"was nicht passt, wird passend gemacht"
in my opinion the same will happen here. if the laws don't fit, the laws will be adjusted, or the terminology will change. it happened with the now no longer unconstitutional wars. and obama said the same:
"we're not really spying on you guys, we're just helping our allies"
you have to applaud the germans for their efforts though. after all they were able to temporarily halt the data retention efforts. i say temporary, because i'm convinced that even if the european court of justice really bans it(which i'm not convinced of), it will be even more crucial for them to have someone from the outside spying.
and besides that there is this rather worrisome notion in politics and lobbyism that a no in court only stays no until you turn it into a yes.