And, for the record, I temporarily completely disabled all encryption to test when connected through the AP again, since the adhoc network also had no encryption, and got no throughput improvement than when I had the WPA-PSK enabled.