Windows is a very poor router, and an even worse VPN solution. Dropping it is the best thing that you can do. To use Windows 2008 you would have to route all traffic through that server, so that the server sorts out what goes over the VPN and what goes straight out the door, That would mean changing all of the default gateways. I have seen it done and it has always sucked. I now always buy routers for clients that can also do VPN so that if/when they grow to multiple sites, the technology is already there.
Simon.