Selector drum set up question

I do not plan on using the 4 speed option and was looking to replace the sport shift shaft (part # 2571-8001) with a bolt
Just to confirm two things;
1- flat side of the washer (part# 2548-8000) faces the gear cluster, my sping holder has a flat side tried to show it in the second photo
2- the flat on the sport shift shaft engaged is for 4 speed option and if i were to use a bolt I would have a locked in 5 speed as shown in the photos I should be in 5 speed mode???
if all works well I will pick up a set of cotter pins 0551-2525 for the shift fork to retain the fork guide and a bolt to replace the sport shift shaft
pine wood derby is this weekend got to finish the wheels!