I have found the same as you. Also try cutting caffiene for a month and see how deeply you sleep.

I might try this again soon, but I am and addict!

Edit: I will add that I have found vitamin B6, zinc and melatonin to have significant effects as well. (Deep sleep and intense dreams)