Keep an eye on those bolts, they're right next to the shaft where shear forces are huge and from the looks of it they are only M6. You may want to use a harder grade to reduce the chances of them being sheared off.