Originally Posted by Unca_Sam

I personally don't expect the cleat attachment to add that much height, especially with you adding 5mm to the pedal to saddle distance.

The measurements you're providing are close, but still don't get the information needed to say yes or no. The measurement that matters is saddle surface to pedal surface, everything else is just a subdivision of that. I'm guessing that you don't know the girth of the saddle that will come on the bike, but in my experience it's usually around 5cm from the rails to the part you're sitting on. I'll also note that the cleat attachment can add some thickness to your shoe/pedal interface, but it's not likely to exceed 1 cm, especially if you aren't riding your flat pedals with minimalist 3-7mm thick soles.

My take is that you'll be fine on the 58, unless you like to ride frames as big as possible.