What about knee socks? Mimitabby has some lovely Smartwool knee socks that she wears with her Ibex wool bike knickers. When it gets warmer, you just roll the socks down to your ankles.