I have similarly experienced non 24 on a roughly 26 hr cycle. I'm curious if you've had your vitamin D levels checked? Mine were abysmal, <13 ng/mL. I've been working on improving that with both a supplement and regular sun exposure. I'm not "fixed", but staying up feels much more like a conscious decision and less like it's out of my control.