I've been using a smart switch to fade in a light (one of the "sun-like" full-spectrum ones) over my head in the morning and it's been really effective for regulating my circadian rhythm. Even with little sleep, I will naturally wake up in the morning at a much more regular time.