If you are comfortable with a little soldering, DrHaas has a thingshield replacement that acts as a Zigbee repeater Forum Link
What makes this device so attractive for your situation is the Zigbee board has a connector for an external antenna.
You can also directly connect contacts and voltages.
Just a thought 
