I am 6’ 1” with your same proportions. I originally bought/rode a 58 that I could never quite get comfortable on with my own adjustments. Eventually I was able to get a bike fit and shorter stem, which helped drastically. However, I downsized to a 56 and am much more comfortable on it. Now the 58 stays on my trainer!