Both, actually. The telcos should have to answer for what they did. If the answer is 'here are the documents showing the requests the executive branch made', then they can have a measure of amnesty, and we go after the executive branch, instead.
Of course, this would all be a lot easier if the legislative branch weren't so busy bowing and scrapping before the executive, themselves. With the new laws, the one ally the people had (i.e., an already split judicial branch) will be permanently barred from taking the administration to task for this; all we'll have left is a report from congress...