These are some big rocks you'll need to move, otherwise your amendment won't be worth the paper it's written on. Just saying "you can collect all the data, but don't use it for surveillance" doesn't mean much.
I have no solutions, feels like we missed the boat if there ever was an opportunity to prevent it in the first place. We live in public now.