21CN/WBC arrived, moved onto ADSL2?

[#1]

Rebooted. Tried a few disconnects too, the connection speed hasn't flinched for a couple of days now.
ADSL Link Downstream Upstream
Connection Speed 2268 kbps 444 kbps
Line Attenuation 49.5 db 25.5 db
Noise Margin 6.5 db 23.2 db
My setup is just two sockets downstairs, one upstairs, with one phone plugged in downstairs. I'm using the upstairs one for the router but nothing's changed there. I did compare the 'master' socket (it doesn't have a test socket) when I first moved in with the extension and saw no appreciable difference.

[#2]

Hi there,
Thanks for raising the fault, I'd recommend leaving the router in the master socket even if there is no difference while the fault is ongoing, as if an engineer attends and it's plugged into an extension socket you may be liable for a charge.
Our team will get investigating and update you as soon as possible.

[#3]

I had a feeling you'd say that. 
I've moved it to the master socket.
Thanks.