Sorry to see that your router is causing you headaches... again and again
If you use a router, you don't need a firewall. In fact, modern (wireless) router has already embedded a hardware firewall, and that's why I've seen people running PCs without using firewall and their PC is still working fine
I, being suspicious of the ability of the router, installed Zonealarm in my notebook for a little experiment, and that Zonealarm have been blocking no intrusion attempts so far, compared to about 100k in a month in my old PC without the router. I guess it's because of my router working.