Before you spend a penny, take a moment for a quick experiment.
Loosen the bar clamp and rotate the handlebar 180°, so the grip position is at the most forward position. Level it out so the hand angle is decent and ride it for a few days. If it feels better overall, you have proof that the frame is too short (seat to bar), and can shop other sizes accordingly.
These days, what with long seatposts, and sloping top tubes, the old BB to saddle and stand over guidelines aren't as important as handlebar height and seat to bar length.
__________________
FB
Chain-L site
An ounce of diagnosis is worth a pound of cure.
Just because I'm tired of arguing, doesn't mean you're right.
“One accurate measurement is worth a thousand expert opinions” - Adm Grace Murray Hopper - USN
WARNING, I'm from New York. Thin skinned people should maintain safe distance.