If the geometry from your current bike is correct, then the 60cm frame would be the correct choice as you could easily compensate for the 20mm differences by using different stems and having more seatpost showing. With the 58cm frame you would have a much harder time getting the bars as high as you would like. For reference, I am 6'1" tall and I have been able to ride both the 58cm and 60cm Crosschecks comfortably and I prefer my bars to be just slightly below seat level.