Salvia id anyone

[LONGK]

I've tried a couple of forums for an id on this one but nothing has hit the spot so far.

I bought it way back in April in bloom at an obscene price from Homebase expecting it to bloom through to the first frosts. However it was all over by June but it is now clear that it is a winter blooming Salvia as it is now budding up again.
The stem is woody and about 25/30mm in diameter at the base.
Loads of photos to help;
Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

Unknown Salvia by longk48, on Flickr

As you can see the foliage darkens to a nice deep green. Fresh growth is distinctly square stemmed and roots easily.

Any ideas?

[charlie]

Salvia corrugata form maybe?

[LONGK]

Salvia corrugata form maybe?

Flower and inflorescence look close but the foliage is too different.
It's a puzzler.