If you are using Tor for a serious reason, you should have separate machines for Tor vs non-Tor activity. There was recently a high profile case (silk road?) where a user forgot to switch browser modes once before logging in to an monitored account to post a quick comment. It only takes once.
I guess that you use the wired connection for Tor, wifi from the router for everything else? Then you still have to enable/disable the network card you want to use at the time.
The current tor browser is perfect. I just switch back and forth between it and my regular browsers as needed.