yeah i'd be looking at the one with the toptube measurement closest to your current bike (proviided that is correctly sized).

i am a bit taller and thinking of getting one myself... what i found odd was the 58 and the 60 have the same toptube length.