Another vote for OpenVPN.  We went this way after our SonicWall died.  We did play around with some cheap firewall/router devices but they were a pain for the various reasons...