Dosent bobby long offer some good ujoints? I think they are machined for full circle clips, and mabye some other mods. I don't know if they offer them for toyotas or notm but here is a link.
http://www.toyotasuperaxles.com/They are a little pricey at 150 ea though.