I would recommend a custom Luna. I am the same height as you and rode a wsd Trek Pilot for four years before I figured out it was too big for me. The Luna is spectacular and fits me perfectly. Margo is wonderful to work with and does an awesome job. If you are willing to wait a few months, it's worth it.

www.lunacyles.com

You can PM me if you have any questions.