You are doing the right things. Try to avoid doing anything energetic before bedtime. If you are a gamer try cutting back on that. Leave your phone in another room at night.

My SAD lamp is really improving my sleep and rythym