You may also consider trying different medications. Ritalin/Concerta types have always had weird effects on my sleep, but the Adderall/Adderall XR ones have always been neutral/helpful when it comes to sleep.