I have had similar internal clock issues as you

Please try adding two (or potentially three) more supplements:

- 10g of glycine before bedtime

- 5g of creatine per day with a meal

These two along with sufficient magnesium have eliminated my sleep related problems I struggled with for an extended time (most of my life, in fact)