The only thing I can add is a little trick that I use to stay focused in the present, or Mindful as its called around where I live, that works great for me.
When I find my mind wandering, I put down my foot just a tiny bit harder on the ground and focus on my feet. Gives me a wonderful feeling of being “rooted in the present”.
The more Yoga I do, the easier I find it to remain Mindful. Pranayama and Meditation in the morning sets me up for a very mindful day.