Hi Baa, I have looked at lots of pictures...Lots look similar except for the flower. All of the ones in my yard have the lower 'lip' (I don't know the word...fall?) and none of the pictures I've seen do. Also the leaves on these plants are thicker than normal but not succulent thick. I really appreciate you taking the time to look for all my unknown weeds!!
It looks like it has square stems, which leads me to think it's a mint. I want to say it's Micromeria brownii. It likes moist soils (not standing water, though) and full sun. You can harvest the leaves of M. brownii and make a wonderful herbal tea. You can also chew on the fresh leaves to freshen your breath.