Definitely go with a flex coupling of some sort! Paying vortec to rebuild their crap is like puttin good money after bad.
You can have a fitting made that mates to the splines and bolts on with a nut and washer for added friction as well.
Just get a good machinist on the problem.
Former owner of '99 CSVT - Silver #222/2760
356/334 wHP/TQ at 10psi on pump gas!
See My Mods
'05 Volvo S40 Turbo 5 AWD with 6spd, Passion Red
'06 Mazda5 Touring, 5spd,MTX, Black