My personal preference is to always err on the side of smaller. If necessary, you can always buy a longer seatpost and/or a longer/higher-rise stem. But buying a frame that's too big is a problem can't be inexpensively "fixed."