The catch to this fit calculator is that it is not recommending a specific frame size. Rather, it helps you to understand what dimensions you are looking for and then decide which combination of frame geometry, stem length, bar height, saddle setback, and saddle height to use.

It sounds to me like you are fine on a 58. The calculator suggests you might want a shorter stem to compensate, but if you already feel a little scrunched up, then forget that.