I want a single box and I don't think there are any good Linux based options for combined ADSL modem and N class wifi ?

I'll probably splash out on a Vigor 2820N, which is what I should have done in the first place, given that I already max out my ADSL line most of the time on non Thomson modems.

Edit:

To be clear, last time I looked to see what the option were for dd-wrt, ADSL2+ and N class wireless in the UK I didn't have much luck. Even the ones I did find it was pot luck which hardware version you'd end up being delivered, with significant downsides if you ended up with a non-optimal version of the hardware.

If anyone knows differently, let me know, I'd be happy to give dd-wrt a go.