It isn't either of those because the flowers are zygomorphic (non-symmetrical). I keep thinking it is a labiate, either a Salvia, Teucrium, Scutellaria or an Origanum but I can't think of a suitable species.
Flower shape and the bit I could see of the stem (square stem, leaves opposite "decussate") so almost certainly a labiate (<"Lamiaceae">). I started off with <"Chaenorhinum origanifolium">, I knew it wasn't that, but it was in right area. Then I looked Salvia, Origanum & Teucrium, but none of those were quite right.
Then I looked at Scutellaria, because I the flower shape was nearer, which led to me to the fact there were Mexican species, and the fact that you lived in the SW made me think it might not be fully hardy and that took me to Scutellaria suffrutescens.
I've got a degree in Botany (and another one in Horticulture) so I have a bit of an advantage, in that I was pretty sure it was labiate right from the start, and one I didn't recognise, so I was fishing in a much smaller pool to start off with.
That's great Darrel, thank for your help.
I was hoping you had found it in a plant key but I guess there's no substitute for knowledge or knowing what it isn't to help narrow things down. The closest I could find was an alpine Penstemon but it had a different growth habit.
A lot of Penstemon would be similar. You get a lot of similar tubular red flowers in the Americas because they are <"bird pollinated"> and that puts strong selective pressure on them to be red and tubular.