I agree about FISA; and Marcy Wheeler has some great stuff to say about Richard Burr's alternate bill and internet collection. [1] However I wouldn't say that 215 is a red herring -- it'll be a significant victory if it sunsets, for reasons Jennifer Granick describes at [2].

[1] https://www.emptywheel.net/2015/05/23/mitch-mcconnell-and-ri...

[2] http://justsecurity.org/23149/rand-paul-wyden-surveillance-r...