Z-Wave Extension to Remote Building

We have a large out-building that is out of Z-Wave range (have tested, signals don't make it). I have CAT5 wiring out to the building, and have Ethernet running out there and a Wifi hot spot, so there's great connectivity. I'd like to be able to control light switches out there with Indigo and am looking for options that might include:

1. Some sort of Z-Wave over Ethernet or Wifi extension/relay device

2. Wifi-controlled light switches that work with Indigo

Any thoughts on either or both solutions?

I'm asking a very similar question...

http://forums.indigodomo.com/viewtopic.php?f=131&t=18442

I use Hue lights - they can be controlled over WiFi using Nathan Sheldon's excellent plugin
You would need an additional Hue Hub for the outbuilding (instructions here: http://forums.indigodomo.com/viewtopic.php?f=31&t=17362&p=132708&hilit=multiple+hue#p132708