#35 is a part that should be replaced as well. You might also consider going up one tooth on the drive sprocket or just getting a new one if you plan on having new driveline parts.
Im unsure of the collar, as I left the output shaft unaltered when I had my engine in a thousand pieces.
Personally, I would avoid getting into the bottom end at all cost if you dont need to. If I have to do that again, id probably move on to one of my other bikes and have my XS bronzed and hung in the wall...