If in doubt, go with the smaller frame. You can always add more length with your seatpost height and saddle position, as well as handlebar bends and stem lengths.

A too-big frame is a lot harder to make "smaller".