I've started using the Draytek 2900 series again.
They seem to be able to do everything (and dhcp option config you want, dual or tri wan, pptp and ipsec vpn, etc)