To deal with the bunching I usually make a hires version of the cloth for final renders. How many polys are those shorts? Fabric in real life bunches too, and a high poly count tends to make it more forgiving. 

Sometimes adding more calculation steps per frame can decrease bunching.