I would probably go with the 52 but with a 31" inseam you're going to be forced to ride with a decent amount of drop even with all of the spacers underneath the bars. I would set the saddle height up at the .883 X cycling inseam and make sure the drop doesn't bother you.