I would even consider ditching the shorts and just wear the tights.
I am in love with spatz. After wearing them over the last 6 months, I find I get tangled up even in my shorts sometimes and I hate it. Like when I try to position my outside foot across their leg in the crook of their knee when in dogfight, for example.
Spatz ftw.
Bookmarks