I'd figure out why your existing system isn't working at gigabit before spending money on another router. But if you want to spend the money, I've been using Linksys RVS4000 units for its VPN capability, but they have a four-port VLAN-able gigabit switch in them and a bunch of other features, too, for around $130.