personally I would always run both the router and a software firewall, see my comments at the bottom.
As suggested elsewhere "sheilds up" at Steve Gibsons site is an excellent way to start. One to watch out for, your router can have you running around in a panic when you fail the tests :lol...