I am approximately the same size as you and am worried that the Canyon site says to get a Small. Any more feedback if the medium is working out for you? Thanks.