Make first amendment rights apply to
'deserialization of data structures across transmission mediums' so that it includes radio, ethernet, fiber, cell networks, satellites, the traces in your motherboard and cellphone.
Then make up some laws about the right to transmit and receive analog and digital signals, make collection of those signals subject to search and seizure laws.
Define surveillance in terms of analog/digital signal collection, apply reasonable limits on data collected and have a transparent method for demasking which includes the alerting the individual demasked so they can seek legal representation.
Push for open and auditable hardware. Push for cheaper infrastructure for servers etc and let the free market do the rest. Forget govt intervention in the form of an 'Internet Bill of Rights', forbid refusal to lease last mile infrastructure and make ISP's compete for it the way it should have been done from the get go. Drive down the cost required to have a scalable service so that individuals can compete with services like facebook and youtube.