Well… I have good news and bad news. I just spent about an hour carefully taking one apart, reseating the zigbee antenna, and reassembling. Inclusion now happened on the first try, and RSSI went from mid 90’s to mid 80’s. Mid 80’s still isn’t great but its a measurable improvement, and more important the switch actually seems to be functioning as it was intended to. With this RSSI I’m not sure if I’ll be able to mount it in a box more than a room away from the hub, but I’ll try to work on that tomorrow…