Likewise but I've found small melatonin doses (plus reducing caffeine to once per day) to really help me conform to a 24 hour day. Worth trying if you haven't.
I take melatonin (0.2mg via a spray). It is very effective. Nightmares are a recurring problem for me and other users I know, but can be solved with low doses and a lot of discipline.