At your height, I'd highly recommend the 61 over the 58. If the 58 feels ok to you (but with plenty of extra standover), then the 61 should feel better. The 61 should have a taller stack; meaning the stem and bars are a bit higher (good for you).

The only drawback to the 61 would be the longer top tube, if that puts it out of the range of comfort. You could probably fine-tune it with a different-length stem.