I made the mistake years ago, when faced with the same dilemma, of going to the larger frame when I really should have gone down to the smaller size.
I did just the opposite when I bought my Litespeed in 1996. The frame came in 55 and 57 cm sizes and, since my previous bike was a 56, I went with the 55. The problem was that my legs are long for my overall height (5' 9") and that required a lot of seatpost extension to get my saddle positioned correctly. So, to get the bars positioned comfortable (~3.5 cm below the saddle) required a long quill stem at first and, later, a lot of spacers when I converted it to a threadless fork and stem. I rode that bike for over 70,000 miles and still have it but always felt it was a bit too small.
When I bought my newer bike in 2006, I went with the 57 cm frame and find it a much better fit as both the seatpost extension and spacer stack are much more "conventional".
Upshot: the size you will like better is also dependent on your proportions.