Hear that, OP? One of our members has a 58 cm frame for you to test ride.
I'm 6'1" and ride a 61 cm Soloist, but a 58 cm in all the other bikes I've had as an adult. I test rode an S2 in 58 several times, and in 61, and preferred the larger frame ... then I found a used Soloist in 61, and jumped on it.