That totally stinks, Crankin! I hate it when stuff like that happens.
Have you tried the Sugoi Evolution shorts? I bought a pair from TE earlier this summer and liked them so much, I bought two more. They were on a good sale. They are quite compressive and long enough that I don't get sausage leg with leg warmers. I know b/c I've been having to wear leg warmers for the past week or so. The chamois (for me) is comfortable. Of course, everyone is different, and one woman's heavenly short may be another's hellish ones.
I wish you luck and hope you have a wonderful time in Portugal!