I would tend to agree with this overall. I'm a daily user of Tor for random browsing, but I use it on what is essentially a throw-away tablet using a Tor-only router.
The NSA and other agencies around the world already has you targeted. Tor makes you safer. Tor makes you aware of risks. This is also good since you are now better suited to defend yourself accordingly.
e.g.
https://rednerd.com/2014/10/16/tor-transparent-proxy-on-a-gl...
https://rednerd.com/2013/12/07/portal-for-debian/
Using the TBB gives me the feeling of painting a giant target on my back.