One of the most helpful things I did to improve my sleep was a CBT clinic at a university here. Was all about good sleep hygiene etc but the key for me to promote good sleep is going to bed and waking at the same time 7 days a week. Can be tough to follow but when I did it, it helped.
Good luck Moose hope you sleep well tonight zzzzzzzzzzzz