Did F2S move you to fixed rate ADSL, because that's what you're on and if you're on an "up to 8Mbps" tier, you could at least get the increased upstream.
Have you tried plugging your router into the test point on your master phone socket?
Just to rule out internal wiring problems.