Yeah, it's pretty much redundant to have both running. I find it easiest to have the router firewall running and leave the computers as is, although I have to remember to turn it on if I take my machine to a public network unless I'm feeling particularly brave and heroic.