Another one you might not have considered is rosmarinic acid ("rosemary extract" or "lemon balm extract" or just a strong lemon balm tea). This reduces the metabolism of GABA and in my experience had a distinct but fairly mild effect on sleep that lasted a month or two of continuous use (unusually) but then took over a year to have any obvious effect again (possibly even longer, I haven't tried it much since and I can't remember if it ever really helped again). Unfortunately, I don't remember it having much effect on my movement issues but since alcohol and benzos affect your issue it might be worth a try rather than those if it happens again (hopefully not!). I was using 200mg rosemary extract standardized at 20% rosmarinic acid (from a no longer available source). I don't know if the chamomile does something similar, in which case it likely wouldn't help you due to the tolerance.