I am about the same as you and ride a 15″ merlin and a 16″ on one.
The Merlin is too short for me in the top tube (but the stand over is excellent) and is running a 90mm stem (don’t like going longer) and a layback saddle moved as far back as I can.
Geometry here: http://www.marchini.co.uk/Rock%20Lobster%20and%20Merlin%20frame%20Geometry.pdf
The On One has a much longer top tube at 600mm effective but still a nice amount of standover. I run that with a 70mm stem and an inline post.
As long as you can stand over the medium okay that will probably be best if you like a short stem. I would rather go shorter stem than fit a long stem.
You seem to prefer the small but I would just worry about feeling cramped on it after while as I now do on my Merlin with a similar 57mm top tube.