Dir-860l Rev B1 very poor wifi performance

I get around the same speeds but without the bufferbloat, see the second part of this post.
To take wired connection problem out of the equation could you do a speedtest with a pc directly connected to the modem and one with a pc directly connected to the router?
Also, do you have SQM QoS enabled?