Hi all, and thanks for all the help so far.
It seems that it would be quicker to get to CDMX from Leon rather than Guanajuato, so we were thinking of sleeping a night there. Any recommendations for a decent hotel in Leon please?

We've spent the night in León many times over the years, both near the leather district (Zona de piel) and in centro, with Centro being our preferred location. In Centro, we always stay at the Ramada Plaza, coincidentally right on the plaza. The suites have a nice view of the plaza, as does 1 of their 2 adequate restaurants. Leon's Centro is quite lively and good for just walking around and people watching, and IMO has the most attractive zocalo/Plaza in that part of Mexico. Madero street connects to the Plaza and has several cafe's and gastropubs, and is the popular nightlife area in Centro. Near the Zona de piel are a holiday inn express & Hottson hotels plus a bunch of more budget hotels. The bus station is right in the center of the Zona, but 2-3 blocks from the aforementioned hotels and probably not a convenient walk with luggage. Taxi to centro is probably 6-7 minutes. You could walk from Centro to the Zona de piel in about 25 minutes or so via Madero & Calzada de los héroes.

View from a suite at ramada