Sounds good. Do yourself a huge favor and leave the cotter pin off for a few days so you can re-tighten the nut at the end of each WORKING day. Keep doing this until the nut does not move. This will all but eliminate the possibility of a future failure.
Better yet, tighten the nut hourly on the first day.