I'd always though of it a strictly a sleep disorder, but maybe treating it as a more general anxiety thing would work. Good idea.
Note that anti-anxiety meds can make you sleepy and have long-term side effects (e.g. increased risk of developing Alzheimer's). That said, they're generally very effective and can probably be taken PRN with less risk.