Hi Michelle,
Neither of those are Leonotis leonurus. They look like a couple variations of Leonotis nepetifolia.
Leonotis leonurus has noticeably different leaves and is more of a shrub with woody older stems.
Leonotis nepetifolia is often mislabeled as Leonotis leonurus for some reason.
