I would go with the 54. I've heard it said that, if you feel that your bike is a bit too large, it's probably way too large. That, because your body is actually pretty adaptable to imperfect geometry. And it's generally easier to make a small bike fit larger than the reverse.