Of course, Leonidas was of the Agiad line. Menelaos (husband of Helen and brother of Agamemnon) was Kynosouran. Forklore has it that Menelaos migrated from Therapne (old Lakedaimon) to the west bank of the Eurotos and later the Spartan people became Lakedaimons. There is a shrine to Menelaos at Therapne.
And there's that fifth village that was part of Sparta -- Amyklai.