I agree with you. Small workarounds like E2E encrypted email aren't enough.
I think that it's time the tech industry had an open and frank discussion about about re-building our infrastructure from the ground up to avoid organizations with means (e.g. the NSA) from abusing the system. Privacy is essential to a healthy culture and a healthy economy. Can you imagine Putin taking advantage of similar tracking to hunt down homosexuals with his draconian anti-gay laws?
This is a pandora's box that needs to locked shut.