Thats what i did to begin with.

Then just replaced the shafts(uprated/correct length) and any worn looking parts from Dave Mac, he can supply the cv joints too.