swapping early 3.09 1st into later case

basically you can use any tail shaft in any 833, all the tail shaft internal splines are the same.
That's what I would do, just change the main shaft and tail housing.