I was in a fairly similar position. My Thomson TG585 v7 router keeps locking up, so I decided it was time to buy a new router. Like you, I didn't want to have to buy another router if/when FTTC becomes available in my area.
I've just ordered a NETGEAR DGND3700.
The features that attracted me were:
1. It has both an ADSL2+ modem built-in AND a Gigabit Ethernet WAN port
2. It has 4 Gigabit Ethernet LAN ports, so it'll replace both my Thomson TG585 v7 AND my NETGEAR GS605 Gigabit switch
3. It apparently uses the Broadcom chipset, so it should cope with my long line length
4. It's dual band (simultaneous 2.4 GHz and 5 GHz)
5. It supports IPV6
6. It allows in-bound and out-bound VPN connections
7. It supports QOS
It can also act as a file server (via two USB 2.0 ports), although that feature wasn't of interest to me since I already have a Windows Home Server.