Sounds like its time to try and engrain a good circadian rhythm pattern. Cortisol, your main waking hormones, and melatonin, your main sleeping hormone, are released in a set rhythm throughout the day. You want to set a circadian rhythm where cortisol peaks in the am about 30min after waking then is lowest before and during sleep while melatonin is highest before bed and during sleep.
1) get sunlight or use a bring light device for 15-20min within the first hour of waking
2) try to get sunlight during the day
3) minimize blue light in the last 1-2 hours before bed or get blue light blocking glasses
As far as supplements go you can try:
Melatonin standard release before bed and if this doesn't help then get a melatonin that has both immediate and extended release properties. Start with a low dose of either option as higher dosages can sustain elevated melatonin levels upon waking and lead to one feeling tired. Standard release, I would start with .5mg and work up to 1.5mg, if this helps you sleep but you are still waking in the middle of the night then try a 1.5mg immediate and sustained release blend. You want one that releases most of the melatonin earlier in the night and tapers off near waking, the sustained levels of melatonin could help set a proper rhythm.