I'd focus on which bike and size puts the handlebars where you want them, preferably without anything pushed to its extreme adjustment. The bike that passes that test will be the bike you can tweak as you get to know it and your body better without having to buy new parts.

At 6'1", my gut says 59cm, the size I raced when I was still 6'1/2" with proportionately long legs.

Ben