Have you checked these out ??
https://www.fasttech.com/products/0/10012175/2066300-kuro-koiler-wire-coiling-tool-3-piece-set
They are 2.0mm, 2.5mm, and 3.0mm
You can buy just one (any size), or get the 3 pack of all 3 sizes.
I wouldn't go over 3.0mm when building .. but that's just me
There's a video out there somewhere, showing how you can use them ... super simple
They also can handle "twisted" wires, and on the thinner wires, you can put two together, and they come out "twisted" right in the gizmo.
Worth a peek