I am the same height as you and have recently purchased a birdy with a comfort stem, just couldn't get it set up right, felt too cramped and too upright. AVC in Bath swapped the stem for the standard stem and its a different bike, feels very similar to my touring bike now

Hope this helps