I would suggest getting the smaller BC. Although the crotch strap would certainly help, if the BC is too big then the strap would be really pulling on your crotch, this could become VERY uncomfortable.
If you do go to a jacket BC go with WI style. This helps keep the jacket down.
If you do go to a jacket BC go with WI style. This helps keep the jacket down.