In the short bit of riding I've done on my new Trek Pilot, I've determined that cycling shorts are not an option like they were on my hybrid

I have two pair, both Nashbar's house brand -- one is meant to be worn under another pair of pants/shorts. The other fits me great through the waist and hips, but are WAAY to tight in my biggest problem area -- my upper legs. Actually, they aren't uncomfortable, but it's quite unsightly, IMHO. Therefore, I also wear a baggier pair of shorts over those cycling shorts.

So, I'm in search of riding shorts that may fit a little better in the legs. Also, is there cooler material out there? Or maybe they just feel so hot because I have two pair of shorts on

I would also like to get a pair of cycling capris.

Any brand suggestions, sizing tips would be appreciated!