In the short term, a muscle relaxant like cyclobenzaprine might help you on both fronts. When I've taken those I split the 10 mg tablets in half, otherwise I'd wake up with a raging hangover.
I like valerian too, or a valerian/hops/skullcap combo. Older allergy pills are another possibility - it's not unusual for me to take a chlorpheniramine maleate at night to both help me sleep, and knock down allergy symptoms that break through the shots and non-drowsy meds.
Speed comes from what you put behind you. - Judi Ketteler