My C6 is OEM and I also have a 1972 F150's C6 as a spare and they both have 31 spline output shafts.
I ran the MPC and most share the same output shafts so thinking a 31 is the way to go.
Likewise it seems the 67-69' 390 / 428 driveshafts share the same PN's (2 varieties though, straight 3" and tapered 3-1/2" which I’m told were used on CJ428’s)
So it shouldn't be too hard to find the flanges to make one up. If you come up short locally there are a couple of speciality shops in the states that have the exact right ones. They use common 1330 U/J's: which are cheap and easy to get locally.
Small point about using 2nd hand shafts, apart from rust etc the other thing some don't know is that most 67-70 Mustang shafts had a cardboard liner for sound deadening. Like a big poster tube. Some break down with time (I cut one up that was being binned out of curiosity, and the cardboard was on its way out). When that happens it affects the balance. So unless it looks really schmicko I'd be a bit wary of running an unknown 50 year old shaft with big HP or at speed. Places like Duggans will whip you up a new tube and balance it spot on for reasonable $$. And they are Mustang / Ford guys from way back. I think Warren still has his Mach 1...
Heres a few photos of one of a C6 slip yoke after cleaning.