Ubiquiti (http://ubnt.com) makes some great wi-fi equipment. One of the pico or nanostation units set to client/station/bridge mode should end any troubles you have. They are incredibly low priced.