Well, I ended up getting the "S" because it was significantly shorter top-tube wise than my old bike.

I also just got back from cycling hols where I rented a 52 cm, not a 54, and it was almost perfect, although fitted with a rather long headset.

So my bottom line is to go "smaller" if stuck in the middle, you can always install "larger" parts.