You could probably fit on a 53cm ett if you wanted to move your seat back 1.5cm, but if you can be comfortable and aero on 54.5cm why change it? A test ride is always the best answer. FWIW I ride 54cm with a 90mm stem.

Of those 2 bikes I think the BMC is better looking and head-turning, and probably has better re-sale. And I like the stock wheels better too. The new Fujis all look like they're trying too hard (e.g.: http://www.fujibikes.com/bike/details/altamira_cx_13 ). But both are above what I'd buy anyway.