Consider getting the 54, but before you do that you will need to read this:
http://www.rivbike.com/how_to_pick_y...g_a_frame_size
http://www.rivbike.com/how_to_pick_your_bike/pbh
Its rivendell bicycles site. It have some insight on measuring for touring and not for racing.