I think that you should try the small with an adjusted seat post height and see if its comfortable. The worst thing is to get a frame that is too big. It seems in this case you are at the smaller end of the medium, so the frame is probably a tad big. With a smaller frame you can always extend your seat post and purchase a longer stem to make the bike comfortable for you.