There's not that much difference between a 58 and a 61. The stack difference is 23mm. That's easy to handle with a -17 stem instead of a -6. The reach is about 15mm longer, but if you've got a long torso, that shouldn't be an issue. The frame may be on the tall side, but then you can probably ride it slammed.

I assume that the seat post is hitting the water bottle cage mounting bolt. Most posts need a 10cm minimum engagement. Take 1cm off at a time, if that is the case. I'm guessing 79cm saddle height.