Thank you for your reply.
Someone has suggested to me that the vetch-like plant could be Hungarian Vetch (which I have never heard of), though looking at pictures of this, I'm unconvinced. The leaves were definitely vetch like, but as you say, the flowers were more lupin-like, though they were definitely not any sort of lupins. They were pea-like, but in upright 'spires'.
As for the other one, I can certainly see the similarity with the plant you mention. Someone else suggested Sweet Mignonette, which is similar to the one you suggested.
