Haha last night I had a revelation: to not care about toe overlap (it was never an issue when I traded with my friend for a day).
I think I'm going to go with the 47cm and get small cages if the stock ones are a wee bit big.