You could use Fasteners WB
https://github.com/shaise/FreeCAD_FastenersWB
https://www.freecadweb.org/wiki/Sandbox:Fasteners
you can also have threads if required. The WB has been developed above the Screw_Maker_2.0 macro
BTW very nice assembly! It could be suggested for FC0.18 Splash screen