Darth Maul Lightsaber - Fixed Pieces

I broke 2 crown pieces while trying to fit it to the other emitter pieces on this lightsaber design. Also my two sabers would not allign when screwed tightly together. Reading the comments of other makers it seems like these are both a common occurrance. I knew just scaling down the file would not resolve the issue because the center peg in Emitter 1 would be too tight and the crown would be too short when fully assembled. What i did was i uploaded the file to tinkercad and scaled down the width and depth bt 3% and left the height alone. I then resized the center hole to 16.5mm so the peg of Emitter 1 should still fit through it. For the middle ring i increased the thickness to 5.5mm so when the two sabers screw together completly the buttons should allign correctly.