Get the 54 for sure. The 51 is way too small. 40 mm standover drop is HUGE. Get off the saddle if stopping for more than a few seconds.
If all else fails, you can wear thicker shoes on flat pedals. A shorter stem is a far better solution than a gangly one.