Found a solution for our clutch disconnect issue where the plastic collar breaks. Napa sells them in 2-packs for $3. They've got a built-in flange. Don't even need the disconnect tool with these you can push them in by hand. For anyone interested:
Napa Part #: NOE 6151166