Look into these products:
http://ubnt.com/products
Using the AirMax series for 10+ km links with 90 Mbit synchronous throughput to connect my house which is in a non-ISP area.
They have products for indoor as well.
Time to upgrade your wireless to the N range which usually gives you ~ 100 Mbit throughput.