If user data were kept separate from corporate data, then the 4th Amendment wouldn't be violated. Unfortunately that's hyper-difficult and not really going to happen anytime soon.
At this point it's hard to see any real cyber security bill get passed into law. The general sentiment around it has been so strongly against in the public that no matter what amendments are made very few want to hear it. It's like the opposite of the gun debate, or in some ways similar to the immigration debate.