Option #3, which is what I did is to buy a DD-wrt flashable wireless router. With the firmware upgrade, you can turn it into a wireless bridge, and go back to using it as a router, if need be.
I got the linksys wrt54G for $40, then flashed it. Works great.