I too am within a hair's breadth of your size, based on your numbers. My daily commuter is a 56cm Kona Dew Drop, which fits me just fine. My old Dew Plus was a 54 which always felt a tad small, but I never really worked too hard at getting it dialed in. I also have a 58cm vintage road bike, and it is unquestionably too big for me -- the reach to the bars is just not comfy.

I suspect you'll never be able to get completely comfortable on the 58, so if you're committed to this direction, I'd head for the 52.