I am just about to order a ComfortFlex Sport Harness for my Riley and got stuck on size. His girth measures 24“ and he is pretty much out of coat. However, the lady selling them is a Sheltie breeder and seems to think a medium will be to large for my Sheltie as he is just over 16“ and weights 25lbs. Perhaps a Small or S/M would be a better fit? For those of you who use the ComfortFlex Harness, could you please tell me how big your shelties are and what size they wear? Thanks!