Hey Liam- any update on how you're doing with the sleep issues?
I've been dealing with similar problems- I fall asleep fine and sleep well but keep waking up about 2 hours before I need to. (ie. around 3.30am when my alarm is set for 5.30am).. I find one of the biggest determinants to be making sure I get my dinner down at least a few hours before bedtime (as well as all the other stuff people chimed in with).
Still trying to sort this out tho.