i2p has a bit better design. Designed to stay secure even if all transit nodes are compromised, exept yours and destination.
Tor has still many nodes that are not belong to governments. Block USA & Canada in your default settings, or leave only exotic countries such as Cambodia or Tajikistan.
Use more than 3 nodes in a chain.
Use Tor only to access your (anonymously purchased) VPN. VPN should never know your real IP or anything about you. Use only bitcoins to buy it, "because they come from nothing". Use bitcoin laundry service before sending btc to VPS provider.
Taking netflow logs from any computer on the Internet is still a hard problem, even for NSA. So if you combine Tor with any other kind of proxy, or if there will be at least one Tor node that is not compromised - things are not so bad.
