Aye, to be honest it's getting on for 7 years old now so a bit overdue a replacement. I'm just so busy renewing everyone else's network hardware that I don't get a chance to do my own... 
I think I'll be going for the 2860 next. At the moment the BT modem is in the living room, and the router is in the loft with the network switch & there's CAT5 running between the two points. If I go for the 2860, I can choose between putting the router in the living room & getting rid of the BT modem, or putting the router in the loft and still using the WAN port.
If its a Huawei HG612 modem then I would unlock it, link LAN2 to an internal switch port, and keep it as the modem, as you can then monitor the stats with various tools or scripts. Mine has been very stable.
I went for an ASUS (first N66U, now an AC68U) and it has 90% of the features of the Draytek (no IPsec VPN server) that I used, but for a significantly less sum. Plus they're both dual band WiFi which Draytek are still missing.
James BT Infinity 2 19/09/2012 - Sold 42/6, Now 52/9, Sync @ 55 / 9.5 Mbps @ 470m approx
15 years broadband (1999 ntl: cablemodem, BT FTTC) - Router: Asus RT-AC68U (merlin) - Modem: HG612 unlocked Typical speedtest