McMaster Carr and Amazon both have 6mm D-cut or D-profile shafts. And both have round 5mm shafts. But I can’t find 5mm D-cut on Amazon, ebay, or McMaster.

I guess the hobbed gear set screw will hold on a round 5mm shaft?

Anyone else found a solution that doesn’t involve DIY?