+1 for the hub adaptor unless you want all the tools to swap everything around and true the spokes up and stuff like that, I feel that would be the cheapest option and I like hub adaptor be it disc brake or other better than the rag joint.
Just my two cents
i think the issue was sorted long long ago...
