I'd drop the data rate down a few notches and see if it improves. Just FYI, I have a Dlink card (forget the exact number) and it's not very good either. A cheaper card worked better.

In closing, I had to update firmware all around and drivers to get it to work its best.

Did you move the WAP to the floor to get closer to your machine?

Bob