Per the Assos size charts, you're on upper limit for a S. However, you indicated that you have short legs.. I assume you mean in relation to your torso? Since leg length only matters if you're looking for tights (are you?), and doesn't really matter for shorts, and if this means that your torso is relatively 'oversized' (longer), I'd probably say try the M.