How to extend home Wifi to Studio down the street?

I have my apartment and my painting studio around 500 feet from each other, both on the third floor. There is a pretty good line of sight between them, and I need to grab the wifi signal from my Airport Extreme in my apartment at my studio.

Right now, I can stand at the window of my studio with my laptop and barely get a signal from my Apartment, no access though.

Was wondering if anyone had input on the best way to extend the network as seamlessly as possible?

Right now, I have been looking into getting a wireless bridge and plugging an external antenna into it on the studio side. (something like a Yagi 16dbi directional). This would suck the signal from my router, but then I have to plug in my laptop at the studio via Ethernet cable. (pain!)

Then if i wanted wireless in my studio, I could plug in another router into the bridge. (I have a DI-624 hanging around in my closet that I could use).

This would work in theory, but be a disaster to set up, with 3 AP's there is bound to be serious configuration problems.

Is there any such thing as a wireless to wireless bridge, where one antenna would be the directional Yagi getting the signal from my apartment, and the other one would be a standard antenna to redistribute it to the studio?

Any better ideas that I am missing?
Thanks in advance

-Stan (NYC)