I'm pretty close on my Surly Cross Check. You just want to *ahem* make sure that nothing too painful will get hit if you end up unexpectedly straddling the bike. It's mostly a safety issue as I understand it. It depends on body proportions - some folks need a "taller" bike to get a good reach.
If you're already talking about putting on a shorter stem, I think I would try the next size smaller and see how that feels too.
Good luck on your fit!
Most days in life don't stand out, But life's about those days that will...