Perhaps obvious but have you tried sleeping in pitch black and/or with eye cover? If you need natural light to wake up you might be able to sleep very well in the dark and mimic it with an ambient light alarm clock