I would do following:
Buy something like that: http://www.applianceshop.eu/index.php/firewalls/opnsense/opnsense-desktop-and-wallmountable.html
So you there is no more need for your router. With the pfsense you can do routing, natting, firewall, vpn, dhcp, dns,...
Go with the WAN into the...