My thoughts are with you, saef. In terms of time, I'm just a few steps ahead of you.
Gymn! Yes!
TM warm up plus ... 3 separate minutes running. Call it about 20-25 mins all in.
20 mins yoga and stretching.
I have new trainers (running shoes). Had my gait analysed on Friday by a great guy of about 24, a track runner with long legs. He treated me as a fellow athlete and reflected back to me (translating into runner speak) that I'd thought this pair of trainers were "a bit snappy". Fantastic. Watch out.