I say move the router if the problem is bad at that sort of distance.
I had a similar issue and moving the router by about 1 foot solved it completely (I found out later that the wall had large numbers of wires in it right by where I had initially put the router).