+1 on the sports stem riser - I am 5'10" also couldn't ride my Birdy with the comfort version. It all depends on what you're used to - make sure your body-bicycle contact points are at identical geometrical relationships to your other bike, and you will definitely be comfortable.
I was able to swap cost-free on my new Birdy. See the Birdy Thread.