Glad you're working on the sleep side of things, its the most underrated performance enhancing drug of them all ;-)
For motivation, i like the LINAS (life is not a sprint) virtual running challenges. They are group challenges, where everyone combines their daily running milage, no matter how big or small, to reach a team goal. Good fun, and not a lot of pressure.
!lolz