It took about a month, but getting off of ambien was helpful to me getting actual sleep, not just the passing out for two hrs around 2am that I was experiencing. I didnt have a solid 8 hrs or anything but the sleep I get is restorative.

In the past, buspar and inderol helped me settle down at night. buspar is a mild anti-depressant, maybe that would help too?