Go with the 58cm.

It's easier to make a small bike feel bigger than it is to make a large bike feel smaller.

BTW, I'm 6'1" with a 32" inseam and I'd never consider a bike over 58cm. You probably fit a 57/58. I had a 59cm Steamroller for like a week and hated the fit.