Since you are purchasing your new bent mainly for commuting and not all out speed, I would still choose the S40. It will be a little slower than the S30 but not significantly based on the speeds you will probably be going.
Once you get the real speed bug and want to race and go really fast, then...