Draytek 2800 slow; Thomson is fast but no VPN - need new router

[#1]

Any suggestions would be very welcome.
I have managed to get a stable-ish sync with the Thomson supplied by Pusnet but I need VPN which this doesn't seem to support.
I ran a Draytek 2800G which has great functionality but the stability, line quality and speed were poor (I've learned that this is due to the modem choice Draytek made a long while back).
Unless I can get the VPN issue sorted, I need to get a new router, preferrably b,g and n, that will give me broad functionality and be as fast as is possible on Plusnet 21CN.
Am I asking too much?! Budget not too much of an issue.
Please let me know what you know. Thanks

[#2]

This http://community.plus.net/library/hardware/how-to-upgradedowngrade-the-firmware-on-the-thomson-585v7... should help with the VPN issue on the Thomson TG585

[#3]

Upgrading the firmware as MisterW links fixed the PPTP VPN issues for me.