I had the same predicament a while back, and went with Andiamo Padded Skins. They're considered underwear. Guessing that the liners linked to by DEK are similar. The claim is that they turn any pair of shorts into cycling shorts. I've found the claim to be true, and have had very good luck with them. Ironically, they were cheaper at my LBS, than on Amazon.