Help needed here please. My Marin Mount Vision has a knackered square taper BB with a cheap and nasty crankset. I've got a nearly mint Shimano XT Octalink crankset. The square taper is English thread x 123 mm. The nearest Octalink BB is 121 mm, would this be a direct replacement or do I need to go shorter since I'm converting the Marin to 1 x 10 ? Thanks in advance.